summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-12-04 10:40:41 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-12-04 10:40:41 +0000
commitf8713e1287e2641c3d2550f7af1a445c77b8552a (patch)
tree3d36c2f46758dfc6d90e9174d4c0ac82c1f3e429 /scripts
parent82ae85de2759eaa68bb2411a1f0a640cf9f8e76a (diff)
downloadguix-f8713e1287e2641c3d2550f7af1a445c77b8552a.tar.gz
* Dirty hack to make nix-push work properly on derivations: the
  derivation should be a source rather than a derivation dependency of
  the call to the NAR derivation.  Otherwise the derivation (and all
  its dependencies) will be built as a side-effect, which may not even
  succeed.

Diffstat (limited to 'scripts')
-rw-r--r--scripts/nix-push.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index c7a0dc6687..ba611465c9 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -128,7 +128,7 @@ while (<READ>) {
 close READ or die "nix-instantiate failed: $?";
 
 
-# Realise the store expressions.
+# Build the derivations.
 print STDERR "creating archives...\n";
 
 my @narPaths;
@@ -144,7 +144,6 @@ while (scalar @tmp > 0) {
     # reference (see above).  Even if that is fixed, using a hook
     # probably wouldn't make that much sense; pumping lots of data
     # around just to compress them won't gain that much.
-    $ENV{"NIX_BUILD_HOOK"} = "";
     my $pid = open(READ, "$binDir/nix-store --no-build-hook --realise @tmp2|")
         or die "cannot run nix-store";
     while (<READ>) {