diff options
Diffstat (limited to 'src/libstore/download.cc')
| -rw-r--r-- | src/libstore/download.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 83737b307..681b74240 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -910,12 +910,7 @@ CachedDownloadResult Downloader::downloadCached( printInfo("unpacking '%s'...", url); Path tmpDir = createTempDir(); AutoDelete autoDelete(tmpDir, true); -#if 0 - unpackTarfile(store->toRealPath(store->printStorePath(*storePath)), tmpDir, std::string(baseNameOf(url))); -#else - // FIXME: this requires GNU tar for decompression. - runProgram("tar", true, {"xf", store->toRealPath(store->printStorePath(*storePath)), "-C", tmpDir}); -#endif + unpackTarfile(store->toRealPath(store->printStorePath(*storePath)), tmpDir); auto members = readDirectory(tmpDir); if (members.size() != 1) throw nix::Error("tarball '%s' contains an unexpected number of top-level files", url); |