about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-31T11·17+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-07-31T11·17+0200
commit511455965e1a17db3653147a4ac0d284a37915be (patch)
tree4d811737405a5bc5b5bbbe30e87598f4ca7cbd17
parent7df4ef983e96f604fa84abe4aeb54dcb00a72add (diff)
nix-shell: Don't disable Automake dependency tracking
Nixpkgs' stdenv disables dependency tracking by default.  That makes
sense for one-time builds, but in an interactive environment we expect
repeated "make" invocations to do the right thing.
-rwxr-xr-xscripts/nix-build.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/nix-build.in b/scripts/nix-build.in
index b3a0f400f89c..73c92c9a7f6c 100755
--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -198,7 +198,8 @@ foreach my $expr (@exprs) {
         writeFile(
             $rcfile,
             '[ -e ~/.bashrc ] && source ~/.bashrc; ' .
-            ($pure ? '' : 'p=$PATH; ' ).
+            ($pure ? '' : 'p=$PATH; ' ) .
+            'dontAddDisableDepTrack=1; ' .
             '[ -e $stdenv/setup ] && source $stdenv/setup; ' .
             ($pure ? '' : 'PATH=$PATH:$p; ') .
             'set +e; ' .