diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-15 13:11:38 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-15 13:11:38 -0400 |
| commit | 3f6a654d9c9d0d238abc04a96281712220f36324 (patch) | |
| tree | 2fdde02314bc6ee3db14b476c702c22264fa0f38 /nixos/modules/programs | |
| parent | edb14763ad316aea1c74667698e1bcf1f44fb7d3 (diff) | |
| parent | 6a756af3e7a50c22a45f7d958657527ac47d2902 (diff) | |
| download | nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar.gz nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar.bz2 nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar.lz nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar.xz nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.tar.zst nixlib-3f6a654d9c9d0d238abc04a96281712220f36324.zip | |
Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs
zsh: don't clobber the environment of non-login shells
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index cff751934d7d..69a56ff69a0d 100644 --- 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} |