diff options
| author | Shea Levy <shea@shealevy.com> | 2012-07-08T14·32-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-09T19·29-0400 |
| commit | a994eb92a4e0d8744b244cd421c855d76831bdc0 (patch) | |
| tree | 3697e5298dd6e6b7334c41ee2a49cb9c9e604b9e | |
| parent | 9d94a28bed39d0e9bcb3532cdac1a254a44efa97 (diff) | |
corepkgs/fetchurl.sh: Use config.nix's curl
| -rw-r--r-- | corepkgs/fetchurl.nix | 4 | ||||
| -rw-r--r-- | corepkgs/fetchurl.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/corepkgs/fetchurl.nix b/corepkgs/fetchurl.nix index c85c007ff218..758212015aee 100644 --- a/corepkgs/fetchurl.nix +++ b/corepkgs/fetchurl.nix @@ -1,3 +1,5 @@ +with import <nix/config.nix>; + # 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 02abb18b4b77..608a946ab8d8 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" |