Merge pull request #47145 from obsidiansystems/fetchzip-cross
fetchzip: Use unzip from buildPackages
This commit is contained in:
commit
aba5f4974a
1 changed files with 5 additions and 6 deletions
|
@ -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 ];
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue