diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-10-12T11·08+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12T11·08+0200 |
| commit | 73252aef18c73f4834b346c677fb723c3a58fb37 (patch) | |
| tree | ef04b0d0d9be45746d2433eb189d72a2e68fb0f1 | |
| parent | 29205e0218b999a5d271401cfd41ee8cc224f329 (diff) | |
| parent | fb98e29067bb3899b3ebf876128a7032dba295e5 (diff) | |
Merge pull request #1591 from shlevy/darwin-installer-no-sudo-i
darwin installer: Fix on systems where sudo -i is disabled.
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 9bb33d4177ed..cea25eb8adf3 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -730,13 +730,13 @@ configure_shell_profile() { setup_default_profile() { _sudo "to installing a bootstrapping Nix in to the default Profile" \ - -i "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_NIX" + HOME=$ROOT_HOME "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_NIX" _sudo "to installing a bootstrapping SSL certificate just for Nix in to the default Profile" \ - -i "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_CACERT" + HOME=$ROOT_HOME "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_CACERT" _sudo "to update the default channel in the default profile" \ - -i NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-channel" --update nixpkgs + HOME=$ROOT_HOME NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-channel" --update nixpkgs } |