Author: eelco
Date: Tue Apr 19 10:52:35 2011
New Revision: 26886
URL: https://svn.nixos.org/websvn/nix/?rev=26886&sc=1
Log:
* 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.
Modified:
nix/trunk/scripts/nix-install-package.in
Modified: nix/trunk/scripts/nix-install-package.in
==============================================================================
--- nix/trunk/scripts/nix-install-package.in Tue Apr 19 10:44:44 2011
(r26885)
+++ nix/trunk/scripts/nix-install-package.in Tue Apr 19 10:52:35 2011
(r26886)
@@ -124,8 +124,11 @@
# 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";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
