diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23T20·25+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23T20·25+0200 |
| commit | 16c9935fa9487f504b1e9c7f14d0f85ac870a62c (patch) | |
| tree | 681df5b4ddc9f451e67e8f58cefe698afb516d53 | |
| parent | 19eddecc0fc4e8c12063626eaf942642894a3580 (diff) | |
Fix fetchurl of executable file
Pointed out by @cstrahan, thanks!
| -rw-r--r-- | corepkgs/fetchurl.nix | 2 | ||||
| -rw-r--r-- | src/libstore/builtins.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/corepkgs/fetchurl.nix b/corepkgs/fetchurl.nix index 64d1f121f81c..9ecb2225ba67 100644 --- a/corepkgs/fetchurl.nix +++ b/corepkgs/fetchurl.nix @@ -16,7 +16,7 @@ derivation { if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; outputHashMode = if executable then "recursive" else "flat"; - inherit system url; + inherit system url executable; # No need to double the amount of network traffic preferLocalBuild = true; diff --git a/src/libstore/builtins.cc b/src/libstore/builtins.cc index 97d6cb943402..25e2e7df30e7 100644 --- a/src/libstore/builtins.cc +++ b/src/libstore/builtins.cc @@ -14,7 +14,7 @@ void builtinFetchurl(const BasicDerivation & drv) if (out == drv.env.end()) throw Error("attribute ‘url’ missing"); 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 (chmod(out->second.c_str(), 0755) == -1) throw SysError(format("making ‘%1%’ executable") % out->second); |