wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00
Code Activity

Rewrite builtin derivation environment

Browse source 
Also add a test.

Fixes #1803.
Closes #1805.
This commit is contained in:
Eelco Dolstra 2018-01-19 14:53:34 +01:00
parent 2896bb6826
commit 3c4c30eadd
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -2933,8 +2933,13 @@ void DerivationGoal::runChild()
if (drv->isBuiltin()) {
try {
logger = makeJSONLogger(*logger);
BasicDerivation drv2(*drv);
for (auto & e : drv2.env)
e.second = rewriteStrings(e.second, inputRewrites);
if (drv->builder == "builtin:fetchurl")
builtinFetchurl(*drv, netrcData);
builtinFetchurl(drv2, netrcData);
else
throw Error(format("unsupported builtin function '%1%'") % string(drv->builder, 8));
_exit(0);