diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-25 17:23:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-25 17:23:53 +0100 |
| commit | fe19d0a3273811549333f624d48d04a8dd406228 (patch) | |
| tree | 89f4a93f530f4c093e51a5ed1678eb2adc766756 | |
| parent | 93f6af107114d90d75331e0e60e3748aad46524e (diff) | |
| parent | 39609a0c9414b398330e42f872e7358e30e133dd (diff) | |
| download | nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar.gz nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar.bz2 nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar.lz nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar.xz nixlib-fe19d0a3273811549333f624d48d04a8dd406228.tar.zst nixlib-fe19d0a3273811549333f624d48d04a8dd406228.zip | |
Merge pull request #13445 from abbradar/ssl-cert-check
stdenv: set SSL_CERT_FILE only if it isn't already
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 8081b69bffd3..b49846fa050c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -384,7 +384,9 @@ paxmark() { true; } # Prevent OpenSSL-based applications from using certificates in # /etc/ssl. -export SSL_CERT_FILE=/no-cert-file.crt +if [ -z "$SSL_CERT_FILE" ]; then + export SSL_CERT_FILE=/no-cert-file.crt +fi ###################################################################### |