diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-02-18 11:48:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 11:48:39 -0600 |
| commit | b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5 (patch) | |
| tree | afe4e06e11b2b8e0e9428716ff3c6b3db940ec36 /nixos/modules | |
| parent | 60a3d9dd6b3216902626fabf6b7b8d5dbcd358db (diff) | |
| parent | 55819e6c861f53450030eea832a76583a6786370 (diff) | |
| download | nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar.gz nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar.bz2 nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar.lz nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar.xz nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.tar.zst nixlib-b3a47c62fb5b8bf71613bbbfe4c73f959c264ef5.zip | |
Merge pull request #80448 from Mic92/zshenv
Revert "zsh: don't clobber the environment of non-login shells"
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 4fbdba47b1df..930cc1987a33 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -162,9 +162,8 @@ 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 - export __ETC_ZSHENV_SOURCED=1 + __ETC_ZSHENV_SOURCED=1 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then . ${config.system.build.setEnvironment} |