From fb2dd3210072a03526e881cd2547cf4c2df4ba52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Oct 2016 17:09:10 +0200 Subject: SSL_CERT_FILE -> NIX_SSL_CERT_FILE This prevents collisions with the "native" OpenSSL, in particular on OS X. Fixes #921. --- scripts/install-nix-from-closure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/install-nix-from-closure.sh') 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. -- cgit 1.4.1