From 959c2af557ee21f360c1554e626bfbee10c52bcf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 25 Aug 2021 23:02:18 -0500 Subject: 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. --- scripts/install-multi-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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" -- cgit v1.2.3