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

Merge pull request #47145 from obsidiansystems/fetchzip-cross

Browse Source 
fetchzip: Use unzip from buildPackages
This commit is contained in:
John Ericson 2018-09-21 14:52:17 -04:00 committed by GitHub
commit aba5f4974a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
, name ? "source"
, ... } @ args:
lib.overrideDerivation (fetchurl ({
(fetchurl ({
inherit name;
recursiveHash = true;
@ -23,8 +23,6 @@ lib.overrideDerivation (fetchurl ({
postFetch =
''
export PATH=${unzip}/bin:$PATH
unpackDir="$TMPDIR/unpack"
mkdir "$unpackDir"
cd "$unpackDir"
@ -48,6 +46,7 @@ lib.overrideDerivation (fetchurl ({
mv "$unpackDir" "$out"
'') #*/
+ extraPostFetch;
} // removeAttrs args [ "stripRoot" "extraPostFetch" ]))
# Hackety-hack: we actually need unzip hooks, too
(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
})