diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-15 10:22:17 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-15 10:22:17 +0200 |
commit | 138c257dcdf42f4edc22e21655e4435751b504b3 (patch) | |
tree | a121d974396addccf813120bd4be9aba209250b7 | |
parent | fb4e2165982dd4e844d5009780c25c260d33375d (diff) |
Revert "binary download: Use $NIX_CURL_FLAGS"
This reverts commit bc4795919afac59af8f27d3c1f26ab404330f718. It
breaks the build:
http://hydra.nixos.org/build/15860847
-rw-r--r-- | scripts/download-from-binary-cache.pl.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index 27c4895c2..cdce8eb74 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -546,7 +546,7 @@ sub downloadBinary { die if $requireSignedBinaryCaches && !defined $info->{signedBy}; print STDERR "\n*** Downloading ‘$url’ ", ($requireSignedBinaryCaches ? "(signed by ‘$info->{signedBy}’) " : ""), "to ‘$storePath’...\n"; checkURL $url; - if (system("$Nix::Config::curl --fail --location --insecure --connect-timeout $curlConnectTimeout $NIX_CURL_FLAGS '$url' $decompressor | $Nix::Config::binDir/nix-store --restore $destPath") != 0) { + if (system("$Nix::Config::curl --fail --location --insecure --connect-timeout $curlConnectTimeout '$url' $decompressor | $Nix::Config::binDir/nix-store --restore $destPath") != 0) { warn "download of ‘$url’ failed" . ($! ? ": $!" : "") . "\n"; next; } |