From 3c52567b3ea92eda9aa8678c1974081a8e9b166b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 5 Oct 2017 09:07:55 -0700 Subject: [PATCH] darwin installer: Fix on systems where sudo -i is disabled. (cherry picked from commit fb98e29067bb3899b3ebf876128a7032dba295e5) --- scripts/install-darwin-multi-user.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 6d8c2960..2ebfb93d 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -748,13 +748,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 }