diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-23 11:23:43 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-23 11:23:43 +0200 |
commit | 29f91c107f5f605dac63552909cbe3c8f0c2e303 (patch) | |
tree | dae9c9d722e9bfd3ddf13b3b3b997a6cfcc178c8 /pkgs/build-support | |
parent | 9af77826a97feb9798f700d64cd467864945875c (diff) | |
parent | 239b694579ca8a9a64e86609d4e9f49d0b01be2b (diff) | |
download | nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.gz nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.bz2 nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.lz nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.xz nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.tar.zst nixlib-29f91c107f5f605dac63552909cbe3c8f0c2e303.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/fetchzip/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 1145d32ba022..751dba56930e 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -23,7 +23,6 @@ lib.overrideDerivation (fetchurl ({ postFetch = '' export PATH=${unzip}/bin:$PATH - mkdir $out unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" @@ -32,8 +31,6 @@ lib.overrideDerivation (fetchurl ({ renamed="$TMPDIR/${baseNameOf url}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" - - shopt -s dotglob '' + (if stripRoot then '' if [ $(ls "$unpackDir" | wc -l) != 1 ]; then @@ -43,12 +40,11 @@ lib.overrideDerivation (fetchurl ({ fi fn=$(cd "$unpackDir" && echo *) if [ -f "$unpackDir/$fn" ]; then - mv "$unpackDir/$fn" "$out" - else - mv "$unpackDir/$fn"/* "$out/" + mkdir $out fi + mv "$unpackDir/$fn" "$out" '' else '' - mv "$unpackDir"/* "$out/" + mv "$unpackDir" "$out" '') #*/ + extraPostFetch; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])) |