diff options
| -rwxr-xr-x | scripts/nix-build.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/nix-build.in b/scripts/nix-build.in index 07752f144f1d..168730bbc92d 100755 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -137,9 +137,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { push @envExclude, $ARGV[$n]; } - elsif ($arg eq "--pure") { - $pure = 1; - } + elsif ($arg eq "--pure") { $pure = 1; } + elsif ($arg eq "--impure") { $pure = 0; } elsif (substr($arg, 0, 1) eq "-") { push @buildArgs, $arg; @@ -185,7 +184,7 @@ foreach my $expr (@exprs) { # Set the environment. if ($pure) { foreach my $name (keys %ENV) { - next if $name eq "HOME" || $name eq "USER" || $name eq "LOGNAME" || $name eq "DISPLAY" || $name eq "PATH" || $name eq "TERM" || $name eq "IN_NIX_SHELL"; + next if grep { $_ eq $name } ("HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL", "TZ"); delete $ENV{$name}; } # NixOS hack: prevent /etc/bashrc from sourcing /etc/profile. @@ -207,12 +206,13 @@ foreach my $expr (@exprs) { ($pure ? '' : 'p=$PATH; ' ) . 'dontAddDisableDepTrack=1; ' . '[ -e $stdenv/setup ] && source $stdenv/setup; ' . - ($pure ? '' : 'PATH=$PATH:$p; ') . + ($pure ? '' : 'PATH=$PATH:$p; unset p; ') . 'set +e; ' . '[ -n "$PS1" ] && PS1="\n\[\033[1;32m\][nix-shell:\w]$\[\033[0m\] "; ' . 'unset NIX_ENFORCE_PURITY; ' . 'unset NIX_INDENT_MAKE; ' . 'shopt -u nullglob; ' . + 'unset TZ; ' . (defined $ENV{'TZ'} ? "export TZ='${ENV{'TZ'}}'; " : '') . $envCommand); $ENV{BASH_ENV} = $rcfile; exec($ENV{NIX_BUILD_SHELL} // "bash", "--rcfile", $rcfile); |