diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-19 14:47:18 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-19 14:47:18 +0100 |
| commit | ee235e764c6a2af1ff3ae24ce8ad9ae0e1928f39 (patch) | |
| tree | 36929ecdd82a22d3eba38c31d4be11208f35e94a /src/nix-prefetch-url | |
| parent | 9f7b4d068cc106e5d902dc6f52bf46d4a057fd00 (diff) | |
| parent | f765e441237cb6679c33cb44372a5b30168c42c8 (diff) | |
Merge branch 'libarchive' of https://github.com/yorickvP/nix
Diffstat (limited to 'src/nix-prefetch-url')
| -rw-r--r-- | src/nix-prefetch-url/nix-prefetch-url.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc index 5040b6fb8..2ec0b07ac 100644 --- a/src/nix-prefetch-url/nix-prefetch-url.cc +++ b/src/nix-prefetch-url/nix-prefetch-url.cc @@ -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. */ |