From d94cb02bfe4119a91948d31b1b9082328955dae1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Apr 2011 10:52:35 +0000 Subject: [PATCH] * 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. --- scripts/nix-install-package.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in index 9f848b16d..f40cfc7d0 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";