about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-04-19T10·52+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-04-19T10·52+0000
commitd94cb02bfe4119a91948d31b1b9082328955dae1 (patch)
treef9eb3c4221abe19d98c6172cd94273a253dfbd17
parent8c69dac8a1d25c043ddb27d5c8dde5b072030667 (diff)
* nix-install-package: unset NIX_REMOTE because $NIX_MANIFESTS_DIR
  doesn't work when building through the Nix daemon.  This also
  ensures an error message when the user doesn't have sufficient
  privileges to do nix-pull.

-rw-r--r--scripts/nix-install-package.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in
index 9f848b16dcbf..f40cfc7d0b23 100644
--- a/scripts/nix-install-package.in
+++ b/scripts/nix-install-package.in
@@ -124,8 +124,11 @@ if ($interactive) {
 
 
 # Store the manifest in the temporary directory so that we don't
-# pollute /nix/var/nix/manifests.
+# pollute /nix/var/nix/manifests.  This also requires that we don't
+# use the Nix daemon (because otherwise download-using-manifests won't
+# see our NIX_MANIFESTS_DIRS environment variable).
 $ENV{NIX_MANIFESTS_DIR} = $tmpDir;
+$ENV{NIX_REMOTE} = "";
 
 
 print "\nPulling manifests...\n";