Merge pull request #5101 from fzakaria/faridzakaria/fix-nix-shell

nix-shell --pure: Let it work for any derivation
2021-08-09 14:52:11 +02:00 · 2021-08-09 14:52:11 +02:00 · 27444d40cf
parent 4c5ce2a345 fbf42c55ac
commit 27444d40cf
1 changed files with 3 additions and 0 deletions
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@ -489,6 +489,9 @@ static void main_nix_build(int argc, char * * argv)
                    "_nix_shell_clean_tmpdir; ") +
                (pure ? "" : "[ -n \"$PS1\" ] && [ -e ~/.bashrc ] && source ~/.bashrc;") +
                "%2%"
+                // always clear PATH.
+                // when nix-shell is run impure, we rehydrate it with the `p=$PATH` above
+                "unset PATH;"
                "dontAddDisableDepTrack=1;\n"
                + structuredAttrsRC +
                "\n[ -e $stdenv/setup ] && source $stdenv/setup; "