diff options
| author | Shea Levy <shea@shealevy.com> | 2017-07-18 09:06:11 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-07-18 09:06:11 -0400 |
| commit | 1ea9a69376d9bd520bac5095beeafd5400b9a4c0 (patch) | |
| tree | 883535956ef7e9f262f01f46b2914dd5acdb9022 /pkgs/build-support | |
| parent | 9c4b1c8fdd1f75eb7c9f1fd9660db1e69784917f (diff) | |
| parent | eb6c45bcae6a7448cbe894167b81f96a7eb5dc0e (diff) | |
| download | nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar.gz nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar.bz2 nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar.lz nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar.xz nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.tar.zst nixlib-1ea9a69376d9bd520bac5095beeafd5400b9a4c0.zip | |
Merge branch 'll-fix-fetchzip-darwin' of https://github.com/obsidiansystems/nixpkgs
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" ])) |