public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetchzip: accept urls 

Required after 9bbfb26854
This commit is contained in:
Sandro Jäckel 2021-04-05 03:40:16 +02:00
parent 60d4ac8280
commit 9f78dd4a1c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/fetchzip/default.nix
View File

@ -5,16 +5,19 @@
# (e.g. due to minor changes in the compression algorithm, or changes # (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps). # in timestamps).
{ fetchurl, unzip }: { lib, fetchurl, unzip }:
{ # Optionally move the contents of the unpacked tree up one level. { # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true stripRoot ? true
, url , url ? ""
, urls ? []
, extraPostFetch ? "" , extraPostFetch ? ""
, name ? "source" , name ? "source"
, ... } @ args: , ... } @ args:
(fetchurl ({ (fetchurl (let
basename = baseNameOf (if url != "" then url else builtins.head urls);
in {
inherit name; inherit name;
recursiveHash = true; recursiveHash = true;
@ -27,7 +30,7 @@
mkdir "$unpackDir" mkdir "$unpackDir"
cd "$unpackDir" cd "$unpackDir"
renamed="$TMPDIR/${baseNameOf url}" renamed="$TMPDIR/${basename}"
mv "$downloadedFile" "$renamed" mv "$downloadedFile" "$renamed"
unpackFile "$renamed" unpackFile "$renamed"
'' ''