diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2021-08-25 23:02:18 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2021-08-25 23:02:22 -0500 |
| commit | 959c2af557ee21f360c1554e626bfbee10c52bcf (patch) | |
| tree | 7cc2fe2f29f75e663f48dc6496da4353d7c0e0c0 /scripts/install-multi-user.sh | |
| parent | af94b54db3a2be100731a215cb5e95f306471731 (diff) | |
Revert "Use /etc/zshenv instead of /etc/zshrc for profile"
This reverts commit 909d8cb2934869c945ac1cc20dfb71df513042eb.
This messes up PATH priority since /etc/profile gets sourced AFTER
/etc/zshenv and it sets the system paths so
$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin is behind
/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin. See discussion in
https://github.com/NixOS/nix/issues/4169.
Diffstat (limited to 'scripts/install-multi-user.sh')
| -rw-r--r-- | scripts/install-multi-user.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index d02c5cac0..513127a62 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -33,7 +33,7 @@ NIX_BUILD_USER_NAME_TEMPLATE="nixbld%d" readonly NIX_ROOT="/nix" readonly NIX_EXTRA_CONF=${NIX_EXTRA_CONF:-} -readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshenv" "/etc/bash.bashrc" "/etc/zsh/zshenv") +readonly PROFILE_TARGETS=("/etc/bashrc" "/etc/profile.d/nix.sh" "/etc/zshrc" "/etc/bash.bashrc" "/etc/zsh/zshrc") readonly PROFILE_BACKUP_SUFFIX=".backup-before-nix" readonly PROFILE_NIX_FILE="$NIX_ROOT/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" |