zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

corepkgs/fetchurl.sh: Use config.nix's curl

Browse source
This commit is contained in:
Shea Levy 2012-07-08 10:32:12 -04:00 committed by Eelco Dolstra
parent 9d94a28bed
commit a994eb92a4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
corepkgs/fetchurl.nix
View file

@ -1,3 +1,5 @@
with import <nix/config.nix>;
# Argh, this thing is duplicated (more-or-less) in Nixpkgs. Need to # Argh, this thing is duplicated (more-or-less) in Nixpkgs. Need to
# find a way to combine them. # find a way to combine them.
@ -19,5 +21,5 @@ derivation {
outputHash = if outputHash != "" then outputHash else outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
inherit system url; inherit system url curl;
} }

2
corepkgs/fetchurl.sh
View file

@ -2,4 +2,4 @@
echo "downloading $url into $out" echo "downloading $url into $out"
@curl@ --fail --location --max-redirs 20 "$url" > "$out" $curl --fail --location --max-redirs 20 "$url" > "$out"