diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13T15·09+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13T15·09+0200 |
commit | fb2dd3210072a03526e881cd2547cf4c2df4ba52 (patch) | |
tree | 3d44c43f4d05a3f038b7e25e070dd50aef69bfa9 /scripts | |
parent | 816d3e57248da2ce4976ae9f8334ee467bcd657e (diff) |
SSL_CERT_FILE -> NIX_SSL_CERT_FILE
This prevents collisions with the "native" OpenSSL, in particular on OS X. Fixes #921.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/install-nix-from-closure.sh | 4 | ||||
-rw-r--r-- | scripts/nix-profile.sh.in | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh index a6b764bcb3b2..3b8c97ed26a1 100644 --- a/scripts/install-nix-from-closure.sh +++ b/scripts/install-nix-from-closure.sh @@ -76,9 +76,9 @@ if ! $nix/bin/nix-env -i "$nix"; then fi # Install an SSL certificate bundle. -if [ -z "$SSL_CERT_FILE" -o ! -f "$SSL_CERT_FILE" ]; then +if [ -z "$NIX_SSL_CERT_FILE" -o ! -f "$NIX_SSL_CERT_FILE" ]; then $nix/bin/nix-env -i "$cacert" - export SSL_CERT_FILE="$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt" + export NIX_SSL_CERT_FILE="$HOME/.nix-profile/etc/ssl/certs/ca-bundle.crt" fi # Subscribe the user to the Nixpkgs channel and fetch it. diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index 41111848b2f3..3cdf431041cb 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -66,19 +66,19 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then fi done - # Set $SSL_CERT_FILE so that Nixpkgs applications like curl work. + # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work. if [ -e /etc/ssl/certs/ca-certificates.crt ]; then # NixOS, Ubuntu, Debian, Gentoo, Arch - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt elif [ -e /etc/ssl/ca-bundle.pem ]; then # openSUSE Tumbleweed - export SSL_CERT_FILE=/etc/ssl/ca-bundle.pem + export NIX_SSL_CERT_FILE=/etc/ssl/ca-bundle.pem elif [ -e /etc/ssl/certs/ca-bundle.crt ]; then # Old NixOS - export SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt + export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt elif [ -e /etc/pki/tls/certs/ca-bundle.crt ]; then # Fedora, CentOS - export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt + export NIX_SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt elif [ -e "$NIX_LINK/etc/ssl/certs/ca-bundle.crt" ]; then # fall back to cacert in Nix profile - export SSL_CERT_FILE="$NIX_LINK/etc/ssl/certs/ca-bundle.crt" + export NIX_SSL_CERT_FILE="$NIX_LINK/etc/ssl/certs/ca-bundle.crt" elif [ -e "$NIX_LINK/etc/ca-bundle.crt" ]; then # old cacert in Nix profile - export SSL_CERT_FILE="$NIX_LINK/etc/ca-bundle.crt" + export NIX_SSL_CERT_FILE="$NIX_LINK/etc/ca-bundle.crt" fi if [ -n ${MANPATH} ]; then |