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/build-support | |
parent | 9176f73ceed438857e8c503a1a34fd0161db6297 (diff) | |
download | nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.gz nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.bz2 nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.lz nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.xz nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.zst nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.zip |
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/rust/fetchcargo.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 7259fa8ff4c..8ddb6a85d0c 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { inherit url rev leaveDotGit fetchSubmodules deepClone branchName; - GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ # We borrow these environment variables from the caller to allow diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 1f5166d5c43..5dd80bd4aa5 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - SSL_CERT_FILE = "${cacert}/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; preferLocalBuild = true; |