public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40759 from pngwjpgh/fix/zshenv 

Revert "zsh: move setEnvironment stuff to zprofile" (#40223)
This commit is contained in:
xeji 2018-05-19 10:58:17 +02:00 committed by GitHub
parent bd6a3b2160 effb02131c
commit 94afddcdb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/zsh/zsh.nix
View File

@ -108,6 +108,8 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.shellInit}
${cfg.shellInit}
@ -127,8 +129,6 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.loginShellInit}
${cfg.loginShellInit}