diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-21 14:52:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 14:52:17 -0400 |
| commit | aba5f4974aeae496c536cfb7b8895cd9b3f29462 (patch) | |
| tree | 466e01cc9b2193f6f18276682000c1e1c28fe0e1 /pkgs/build-support | |
| parent | 3ac97c054f9fc35d0872a6e05dbfe839a07ec73d (diff) | |
| parent | b97242238d7efb029c76eb8d4fe4b1228a5b49a8 (diff) | |
| download | nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar.gz nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar.bz2 nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar.lz nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar.xz nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.tar.zst nixlib-aba5f4974aeae496c536cfb7b8895cd9b3f29462.zip | |
Merge pull request #47145 from obsidiansystems/fetchzip-cross
fetchzip: Use unzip from buildPackages
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchzip/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 4a5381d71f20..f1b9b9290d4c 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -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 ]; +}) |