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

Put the builder context in a struct

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-01 12:46:40 +02:00
parent 40bbad3be5
commit fe0124fe17
5 changed files with 40 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libstore/unix/build/derivation-builder.cc
View file

@ -1860,15 +1860,15 @@ void DerivationBuilderImpl::runChild()
/* Make the contents of netrc and the CA certificate bundle
available to builtin:fetchurl (which may run under a
different uid and/or in a sandbox). */
std::string netrcData;
std::string caFileData;
BuiltinBuilderContext ctx{.drv = drv};
if (drv.isBuiltin() && drv.builder == "builtin:fetchurl") {
try {
netrcData = readFile(settings.netrcFile);
ctx.netrcData = readFile(settings.netrcFile);
} catch (SystemError &) { }
try {
caFileData = readFile(settings.caFile);
ctx.caFileData = readFile(settings.caFile);
} catch (SystemError &) { }
}
@ -2289,21 +2289,16 @@ void DerivationBuilderImpl::runChild()
try {
logger = makeJSONLogger(getStandardError());
std::map<std::string, Path> outputs;
for (auto & e : drv.outputs)
outputs.insert_or_assign(e.first,
ctx.outputs.insert_or_assign(e.first,
store.printStorePath(scratchOutputs.at(e.first)));
if (drv.builder == "builtin:fetchurl")
builtinFetchurl(drv, outputs, netrcData, caFileData);
else {
std::string builtinName = drv.builder.substr(8);
assert(RegisterBuiltinBuilder::builtinBuilders);
if (auto builtin = get(*RegisterBuiltinBuilder::builtinBuilders, builtinName))
(*builtin)(drv, outputs);
else
throw Error("unsupported builtin builder '%1%'", builtinName);
}
std::string builtinName = drv.builder.substr(8);
assert(RegisterBuiltinBuilder::builtinBuilders);
if (auto builtin = get(*RegisterBuiltinBuilder::builtinBuilders, builtinName))
(*builtin)(ctx);
else
throw Error("unsupported builtin builder '%1%'", builtinName);
_exit(0);
} catch (std::exception & e) {
writeFull(STDERR_FILENO, e.what() + std::string("\n"));