nix-shell: Set $IN_NIX_SHELL before evaluating

NixOS · Jan 13, 2014 · ea59f39326c8e9dc42dfed4bcbf597fbce58797c · ea59f39
1 parent f4013b6
commit ea59f39326c8e9dc42dfed4bcbf597fbce58797c
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 scripts/nix-build.in
diff --git a/scripts/nix-build.in b/scripts/nix-build.in
@@ -152,6 +152,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
 
 @exprs = ("./default.nix") if scalar @exprs == 0;
 
+$ENV{'IN_NIX_SHELL'} = 1 if $runEnv;
+
 
 foreach my $expr (@exprs) {
 
@@ -193,8 +195,6 @@ foreach my $expr (@exprs) {
         $ENV{'NIX_STORE'} = $Nix::Config::storeDir;
         $ENV{$_} = $drv->{env}->{$_} foreach keys %{$drv->{env}};
 
-        $ENV{'IN_NIX_SHELL'} = 1;
-
         # Run a shell using the derivation's environment.  For
         # convenience, source $stdenv/setup to setup additional
         # environment variables and shell functions.  Also don't lose