mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

<nix/fetchurl.nix>: Support downloading and unpacking NARs

Browse source 
This removes the need to have multiple downloads in the stdenv
bootstrap process (like a separate busybox binary for Linux, or
curl/mkdir/sh/bzip2 for Darwin). Now all those files can be combined
into a single NAR.
This commit is contained in:
Eelco Dolstra 2015-10-30 11:27:47 +01:00
parent 5c28943e8f
commit dae5dc7ade
4 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/builtins.cc
View file

@ -1,5 +1,7 @@
#include "builtins.hh"
#include "download.hh"
#include "store-api.hh"
#include "archive.hh"
namespace nix {
@ -20,12 +22,21 @@ void builtinFetchurl(const BasicDerivation & drv)
auto out = drv.env.find("out");
if (out == drv.env.end()) throw Error("attribute ‘url’ missing");
writeFile(out->second, data.data);
Path storePath = out->second;
assertStorePath(storePath);
auto unpack = drv.env.find("unpack");
if (unpack != drv.env.end() && unpack->second == "1") {
StringSource source(data.data);
restorePath(storePath, source);
} else
writeFile(storePath, data.data);
auto executable = drv.env.find("executable");
if (executable != drv.env.end() && executable->second == "1") {
if (chmod(out->second.c_str(), 0755) == -1)
throw SysError(format("making ‘%1%’ executable") % out->second);
if (chmod(storePath.c_str(), 0755) == -1)
throw SysError(format("making ‘%1%’ executable") % storePath);
}
}