From a994eb92a4e0d8744b244cd421c855d76831bdc0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 8 Jul 2012 10:32:12 -0400 Subject: [PATCH] corepkgs/fetchurl.sh: Use config.nix's curl --- corepkgs/fetchurl.nix | 4 +++- corepkgs/fetchurl.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/corepkgs/fetchurl.nix b/corepkgs/fetchurl.nix index c85c007ff..758212015 100644 --- a/corepkgs/fetchurl.nix +++ b/corepkgs/fetchurl.nix @@ -1,3 +1,5 @@ +with import ; + # Argh, this thing is duplicated (more-or-less) in Nixpkgs. Need to # find a way to combine them. @@ -19,5 +21,5 @@ derivation { outputHash = if outputHash != "" then outputHash else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - inherit system url; + inherit system url curl; } diff --git a/corepkgs/fetchurl.sh b/corepkgs/fetchurl.sh index 02abb18b4..608a946ab 100644 --- a/corepkgs/fetchurl.sh +++ b/corepkgs/fetchurl.sh @@ -2,4 +2,4 @@ echo "downloading $url into $out" -@curl@ --fail --location --max-redirs 20 "$url" > "$out" +$curl --fail --location --max-redirs 20 "$url" > "$out"