diff options
| author | K900 <me@0upti.me> | 2023-03-23 18:57:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 18:57:40 +0300 |
| commit | 382c75609754981c38a8f68e8d5528f3d07d0e00 (patch) | |
| tree | 9730221f25ea18067f12000ad97f5b3e26dbb9db /pkgs/shells | |
| parent | 598cf2090c6f8b88c0518057e791d2b5584dd9b1 (diff) | |
| parent | 8e2e741ab5bdea119a34013b1387eb3f281841cb (diff) | |
Merge pull request #217205 from linj-fork/fix-zsh-set-env
zsh: set environment variables in zshenv instead of zprofile
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5a003b889a04a..3a5a83ad1f8c1 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { "--enable-multibyte" "--with-tcsetpgrp" "--enable-pcre" - "--enable-zprofile=${placeholder "out"}/etc/zprofile" + "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba @@ -64,34 +64,36 @@ stdenv.mkDerivation { postInstall = '' make install.info install.html mkdir -p $out/etc/ - cat > $out/etc/zprofile <<EOF + cat > $out/etc/zshenv <<EOF if test -e /etc/NIXOS; then - if test -r /etc/zprofile; then - . /etc/zprofile + if test -r /etc/zshenv; then + . /etc/zshenv else emulate bash alias shopt=false - . /etc/profile + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . /etc/set-environment + fi unalias shopt emulate zsh fi - if test -r /etc/zprofile.local; then - . /etc/zprofile.local + if test -r /etc/zshenv.local; then + . /etc/zshenv.local fi else - # on non-nixos we just source the global /etc/zprofile as if we did + # on non-nixos we just source the global /etc/zshenv as if we did # not use the configure flag - if test -r /etc/zprofile; then - . /etc/zprofile + if test -r /etc/zshenv; then + . /etc/zshenv fi fi EOF ${if stdenv.hostPlatform == stdenv.buildPlatform then '' - $out/bin/zsh -c "zcompile $out/etc/zprofile" + $out/bin/zsh -c "zcompile $out/etc/zshenv" '' else '' - ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zshenv" ''} - mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used + mv $out/etc/zshenv $out/etc/zshenv_zwc_is_used rm $out/bin/zsh-${version} mkdir -p $out/share/doc/ |