lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

Install cacert before running nix-channel

Browse source 
Also, make it more robust against incorrent SSL_CERT_FILE values.
This commit is contained in:
Eelco Dolstra 2014-12-13 16:53:21 +01:00
parent b77037b8fd
commit c2a552b075
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/install-nix-from-closure.sh
View file

@ -72,6 +72,12 @@ if ! $nix/bin/nix-env -i "$nix"; then
exit 1
fi
# Install an SSL certificate bundle.
if [ -z "$SSL_CERT_FILE" -o ! -f "$SSL_CERT_FILE" ]; then
$nix/bin/nix-env -i "$cacert"
export SSL_CERT_FILE="$HOME/.nix-profile/etc/ca-bundle.crt"
fi
# Subscribe the user to the Nixpkgs channel and fetch it.
if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
$nix/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
@ -80,11 +86,6 @@ if [ -z "$_NIX_INSTALLER_TEST" ]; then
$nix/bin/nix-channel --update nixpkgs
fi
# Install an SSL certificate bundle.
if [ -z "$SSL_CERT_FILE" ]; then
$nix/bin/nix-env -i "$cacert"
fi
# Make the shell source nix.sh during login.
p=$NIX_LINK/etc/profile.d/nix.sh