diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-28 10:31:46 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-28 10:31:46 -0400 |
| commit | ef71caba2960f163310d444db42ff30f5334b92f (patch) | |
| tree | b8fe57312ddfc212ba6d2ec06a47f6263651009b /scripts | |
| parent | 0f3f90107174c74e9416c58b5989047dd40fc61f (diff) | |
| parent | f60ce4fa207a210e23a1142d3a8ead611526e6e1 (diff) | |
Merge remote-tracking branch 'upstream/master' into more-rust-ffi
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install-multi-user.sh | 2 | ||||
| -rw-r--r-- | scripts/install.in | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index d04b4bbbf..157e8ddb4 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -31,7 +31,7 @@ readonly NIX_FIRST_BUILD_UID="30001" readonly NIX_ROOT="/nix" readonly NIX_EXTRA_CONF=${NIX_EXTRA_CONF:-} -readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshrc") +readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshenv") readonly PROFILE_BACKUP_SUFFIX=".backup-before-nix" readonly PROFILE_NIX_FILE="$NIX_ROOT/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" diff --git a/scripts/install.in b/scripts/install.in index 6709f00d4..1d26c4ff0 100644 --- a/scripts/install.in +++ b/scripts/install.in @@ -36,7 +36,9 @@ tarball="$tmpDir/$(basename "$tmpDir/nix-@nixVersion@-$system.tar.xz")" require_util curl "download the binary tarball" require_util tar "unpack the binary tarball" -require_util xz "unpack the binary tarball" +if [ "$(uname -s)" != "Darwin" ]; then + require_util xz "unpack the binary tarball" +fi echo "downloading Nix @nixVersion@ binary tarball for $system from '$url' to '$tmpDir'..." curl -L "$url" -o "$tarball" || oops "failed to download '$url'" |