diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:30:15 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:34:58 +0200 |
| commit | 55932c1beca26c7b5b7c259d95f6eb80644150a7 (patch) | |
| tree | a2faafd73c3dcda7418278961a6ddf41d6d33d5c /pkgs/development | |
| parent | 23562aad59048e8e1202e618fcf402079f1593b8 (diff) | |
| download | nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.gz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.bz2 nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.lz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.xz nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.zst nixpkgs-55932c1beca26c7b5b7c259d95f6eb80644150a7.zip | |
Don't statically depend on cacert for certificates
This reverts commit cd52c044568bdf1108428698048a9af92dc0b625 and others. Managing certificates (including revoking certificates and adding custom certificates) becomes extremely painful if every package in the system potentially depends on a different copy of cacert. Also, it makes updating cacert rather expensive.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/elixir/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib-networking/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 99d649f3f68..c9a83774486 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: +{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }: let version = "1.0.5"; @@ -32,8 +32,8 @@ stdenv.mkDerivation { b=$(basename $f) if [ $b == "mix" ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" + --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ + --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 79b31b1365b..a17b7a21409 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas, cacert }: +, gsettings_desktop_schemas }: let ver_maj = "2.44"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) |