From ea59f39326c8e9dc42dfed4bcbf597fbce58797c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jan 2014 13:42:29 +0100
Subject: [PATCH] nix-shell: Set $IN_NIX_SHELL before evaluating
---
scripts/nix-build.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index 8e6f43a37..5d5769246 100755
--- 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
--
GitLab