From 68dcbb187e540034e85b5b77d1b37cec1759a587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Dec 2012 15:00:07 +0100 Subject: download-from-binary-cache: Use the channels of the calling user rather than root This should make live easier for single-user (non-daemon) installations. Note that when the daemon is used, the "calling user" is root so we're not using any untrusted caches. --- scripts/download-from-binary-cache.pl.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/download-from-binary-cache.pl.in') diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index b822466719f2..98333dafb018 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -36,6 +36,8 @@ my %requests; my %scheduled; my $caBundle = $ENV{"CURL_CA_BUNDLE"} // $ENV{"OPENSSL_X509_CERT_FILE"}; +my $userName = getpwuid($<) or die "cannot figure out user name"; + sub addRequest { my ($storePath, $url, $head) = @_; @@ -195,7 +197,7 @@ sub getAvailableCaches { # // ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : "")); my $urlsFiles = $Nix::Config::config{"binary-cache-files"} - // "/nix/var/nix/profiles/per-user/root/channels/binary-caches/*"; + // "$Nix::Config::stateDir/profiles/per-user/$userName/channels/binary-caches/*"; foreach my $urlFile (glob $urlsFiles) { next unless -f $urlFile; open FILE, "<$urlFile" or die "cannot open ‘$urlFile’\n"; -- cgit 1.4.1