diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-05 13:00:52 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-05 13:00:52 -0700 |
| commit | ffd0539eba473348f752fa8ab1f1f55388634f8f (patch) | |
| tree | f7a7fcc8b0a71d3b323595bbf241886dbc31a023 /pkgs/development | |
| parent | 9176f73ceed438857e8c503a1a34fd0161db6297 (diff) | |
| download | nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.gz nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.bz2 nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.lz nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.xz nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.zst nixlib-ffd0539eba473348f752fa8ab1f1f55388634f8f.zip | |
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
Diffstat (limited to 'pkgs/development')
6 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix index fe7ec5851557..8a96d1c380dd 100644 --- a/pkgs/development/compilers/icedtea/default.nix +++ b/pkgs/development/compilers/icedtea/default.nix @@ -135,7 +135,7 @@ let # Generate certificates. pushd $jre/lib/icedtea/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/icedtea/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index d0ca85af0e0e..beab781c88da 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index c27808661613..132f0f31b873 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -136,7 +136,7 @@ let # Generate certificates. pushd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt popd ln -s $out/lib/openjdk/bin $out/bin diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9d12d42cee88..6bb8c0565d54 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ - --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt" + --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt" done ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 79c8ac031832..79b31b1365b7 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; }; - configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt"; + configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt"; preBuild = '' sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 32f5928cccd4..5e2bdd0cc549 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -40,7 +40,7 @@ let lispPackages = rec { url = "https://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); overrides = x: { configurePhase="buildPhase(){ true; }"; }; @@ -314,7 +314,7 @@ let lispPackages = rec { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";})); + }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); }; cl-fuse-meta-fs = buildLispPackage rec { |