movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #15579 from abbradar/nixos-install-ssl

Browse source 
nixos-install: fix SSL certificate error
This commit is contained in:
Nikolay Amiantov 2016-06-23 07:48:45 +04:00 • committed by GitHub
commit 21f9180d49
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/installer/tools/nixos-install.sh
View file

@ -91,12 +91,10 @@ ln -s /run $mountPoint/var/run
rm -f $mountPoint/etc/{resolv.conf,hosts} rm -f $mountPoint/etc/{resolv.conf,hosts}
cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/ cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/
if [ -e "$SSL_CERT_FILE" ]; then cp -Lf "@cacert@" "$mountPoint/tmp/ca-cert.crt"
cp -Lf "$SSL_CERT_FILE" "$mountPoint/tmp/ca-cert.crt" export SSL_CERT_FILE=/tmp/ca-cert.crt
export SSL_CERT_FILE=/tmp/ca-cert.crt # For Nix 1.7
# For Nix 1.7 export CURL_CA_BUNDLE=/tmp/ca-cert.crt
export CURL_CA_BUNDLE=/tmp/ca-cert.crt
fi
if [ -n "$runChroot" ]; then if [ -n "$runChroot" ]; then
if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then

1
nixos/modules/installer/tools/tools.nix
View file

@ -23,6 +23,7 @@ let
inherit (pkgs) perl pathsFromGraph; inherit (pkgs) perl pathsFromGraph;
nix = config.nix.package.out; nix = config.nix.package.out;
cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
nixClosure = pkgs.runCommand "closure" nixClosure = pkgs.runCommand "closure"
{ exportReferencesGraph = ["refs" config.nix.package.out]; } { exportReferencesGraph = ["refs" config.nix.package.out]; }