Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs

zsh: don't clobber the environment of non-login shells
2014-03-15 13:11:38 -04:00 · 2014-03-15 13:11:38 -04:00 · 3f6a654d9c
parent edb14763ad 6a756af3e7
commit 3f6a654d9c
1 changed files with 2 additions and 1 deletions
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@ -116,8 +116,9 @@ in
        # This file is read for all shells.

        # Only execute this file once per shell.
+        # But don't clobber the environment of interactive non-login children!
        if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
-        __ETC_ZSHENV_SOURCED=1
+        export __ETC_ZSHENV_SOURCED=1

        ${cfg.shellInit}