diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-25 20:09:55 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-25 20:16:21 -0500 |
| commit | 24b5eb61eb944036b5716788ead1b204fba08719 (patch) | |
| tree | b85fad0544d0f4e32a66c22f74b7b27318da7c07 /pkgs/build-support/fetchzip | |
| parent | 6e7d708bcc25c9e9fafd79e08a4b2fbcf94cda86 (diff) | |
| download | nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar.gz nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar.bz2 nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar.lz nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar.xz nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.tar.zst nixpkgs-24b5eb61eb944036b5716788ead1b204fba08719.zip | |
fetchzip: fix unpacking regression
This resolves a regression introduced in fc0135370342, where providing a
name without a proper extension breaks existing uses of fetchzip (they
now fail to unpack). Of particular note, that commit broke all uses of
fetchFromGitHub because it uses a name like so: "${repo}-${rev}-src"
Fixes #5954
Diffstat (limited to 'pkgs/build-support/fetchzip')
| -rw-r--r-- | pkgs/build-support/fetchzip/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index ffdf45a1865..46e7d917160 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -28,7 +28,7 @@ lib.overrideDerivation (fetchurl ({ mkdir "$unpackDir" cd "$unpackDir" - renamed="$TMPDIR/$name" + renamed="$TMPDIR/${baseNameOf url}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" |