lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix fetchurl of executable file

Browse source 
Pointed out by @cstrahan, thanks!
This commit is contained in:
Eelco Dolstra 2015-07-23 22:25:04 +02:00
parent 19eddecc0f
commit 16c9935fa9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
corepkgs/fetchurl.nix
View file

@ -16,7 +16,7 @@ derivation {
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
outputHashMode = if executable then "recursive" else "flat"; outputHashMode = if executable then "recursive" else "flat";
inherit system url; inherit system url executable;
# No need to double the amount of network traffic # No need to double the amount of network traffic
preferLocalBuild = true; preferLocalBuild = true;

2
src/libstore/builtins.cc
View file

@ -14,7 +14,7 @@ void builtinFetchurl(const BasicDerivation & drv)
if (out == drv.env.end()) throw Error("attribute ‘url’ missing"); if (out == drv.env.end()) throw Error("attribute ‘url’ missing");
writeFile(out->second, data.data); writeFile(out->second, data.data);
auto executable = drv.env.find("out"); auto executable = drv.env.find("executable");
if (executable != drv.env.end() && executable->second == "1") { if (executable != drv.env.end() && executable->second == "1") {
if (chmod(out->second.c_str(), 0755) == -1) if (chmod(out->second.c_str(), 0755) == -1)
throw SysError(format("making ‘%1%’ executable") % out->second); throw SysError(format("making ‘%1%’ executable") % out->second);