* Enable nix-prefetch-url caching in nix-channel.

2 files changed, 9 insertions, 3 deletions

diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index fd6639ec1b31..6a4603976fb9 100644
--- a/scripts/nix-channel.in
+++ b/scripts/nix-channel.in
@@ -8,6 +8,12 @@ my $stateDir = $ENV{"NIX_STATE_DIR"};
 $stateDir = "@localstatedir@/nix" unless defined $stateDir;
 
 
+# Turn on caching in nix-prefetch-url.
+my $channelCache = "$stateDir/channel-cache";
+$ENV{'NIX_DOWNLOAD_CACHE'} = $channelCache;
+mkdir $channelCache, 0755 unless -e $channelCache;
+
+
 # Figure out the name of the `.nix-channels' file to use.
 my $home = $ENV{"HOME"};
 die '$HOME not set' unless defined $home;
diff --git a/scripts/nix-pack-closure.in b/scripts/nix-pack-closure.in
index 8d9ecf126200..0634537d0a57 100644
--- a/scripts/nix-pack-closure.in
+++ b/scripts/nix-pack-closure.in
@@ -17,9 +17,9 @@ $binDir = "@bindir@" unless defined $binDir;
 my $tmpDir = tempdir("nix-pack-closure.XXXXXX", CLEANUP => 1, TMPDIR => 1)
     or die "cannot create a temporary directory";
 
-mkdir "$tmpDir/contents", 0777 or die;
-mkdir "$tmpDir/references", 0777 or die;
-mkdir "$tmpDir/derivers", 0777 or die;
+mkdir "$tmpDir/contents", 0755 or die;
+mkdir "$tmpDir/references", 0755 or die;
+mkdir "$tmpDir/derivers", 0755 or die;
 
 open TOPLEVEL, ">$tmpDir/top-level" or die;