Fix #27448 argument list too long in fetchzip for darwin.

Paired with @Ericson2314
wip/yesman
luigy 7 years ago
parent f30dd71a38
commit eb6c45bcae
  1. 10
      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" ]))

Loading…
Cancel
Save