diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-05-19 10:56:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-05-19 10:56:11 +0200 |
| commit | 96a604320a044a49c8f74114cbf3f66b86399529 (patch) | |
| tree | c98db94706a657320fcce200cefeffb6259e1e23 /pkgs/stdenv | |
| parent | 19dd115588667b1f4cff178ded84642b6a14f45a (diff) | |
| parent | 99760ed95bc2e31cadeda9d0911a8d38d6077df8 (diff) | |
| download | nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar.gz nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar.bz2 nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar.lz nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar.xz nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.tar.zst nixpkgs-96a604320a044a49c8f74114cbf3f66b86399529.zip | |
Merge #61179: stdenv, cacert: $NIX_SSL_CERT_FILE changes
... into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 6f1a654a38a..dcccdaa50ae 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -646,10 +646,13 @@ fi export NIX_BUILD_CORES -# Prevent OpenSSL-based applications from using certificates in -# /etc/ssl. -# Leave it in shells for convenience. -if [ -z "${SSL_CERT_FILE:-}" ] && [ -z "${IN_NIX_SHELL:-}" ]; then +# Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. +# Leave it in impure shells for convenience. +if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then + export NIX_SSL_CERT_FILE=/no-cert-file.crt +fi +# Another variant left for compatibility. +if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then export SSL_CERT_FILE=/no-cert-file.crt fi |