wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Merge branch 'libarchive' of https://github.com/yorickvP/nix

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-19 14:47:18 +01:00
commit ee235e764c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
17 changed files with 128 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/nix-prefetch-url/nix-prefetch-url.cc
View file

@ -190,10 +190,7 @@ static int _main(int argc, char * * argv)
printInfo("unpacking...");
Path unpacked = (Path) tmpDir + "/unpacked";
createDirs(unpacked);
if (hasSuffix(baseNameOf(uri), ".zip"))
runProgram("unzip", true, {"-qq", tmpFile, "-d", unpacked});
else
unpackTarfile(tmpFile, unpacked, std::string(baseNameOf(uri)));
unpackTarfile(tmpFile, unpacked);
/* If the archive unpacks to a single file/directory, then use
that as the top-level. */