fetchzip: remove need for overrideAttrs

This commit is contained in:
Jonathan Ringer 2022-02-09 16:43:37 -08:00 committed by Jonathan Ringer
parent b97b9c376c
commit 24cbda98f3
2 changed files with 8 additions and 5 deletions

View file

@ -95,6 +95,9 @@ in
# Doing the download on a remote machine just duplicates network
# traffic, so don't do that by default
, preferLocalBuild ? true
# Additional packages needed as part of a fetch
, nativeBuildInputs ? [ ]
}:
assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
@ -128,7 +131,7 @@ stdenvNoCC.mkDerivation {
builder = ./builder.sh;
nativeBuildInputs = [ curl ];
nativeBuildInputs = [ curl ] ++ nativeBuildInputs;
urls = urls_;

View file

@ -13,6 +13,7 @@
, urls ? []
, extraPostFetch ? ""
, name ? "source"
, nativeBuildInputs ? [ ]
, # Allows to set the extension for the intermediate downloaded
# file. This can be used as a hint for the unpackCmdHooks to select
# an appropriate unpacking tool.
@ -31,6 +32,8 @@ in {
downloadToTemp = true;
nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
postFetch =
''
unpackDir="$TMPDIR/unpack"
@ -64,7 +67,4 @@ in {
+ ''
chmod 755 "$out"
'';
} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: {
# Hackety-hack: we actually need unzip hooks, too
nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];
})
} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" "nativeBuildInputs" ]))