guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: send all changed settings to builtin-builder

Browse Source 
this includes logger verbosity, which isn't a setting for some reason.

fixes #1111

Change-Id: Ib078205b41069628010273645e26baf33b1c6d14
This commit is contained in:
eldritch horrors
2026-02-12 18:00:33 +00:00
parent 6e3a7711ca
commit 9520e663c8
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/legacy/builtin-builder.cc
+8 -1
View File
@@ -34,6 +34,12 @@ static int main_builtin_builder(AsyncIoRoot & aio, std::string programName, Stri
return *argvIt++;
};
if (auto val = string2Int<int>(getArg("verbosity"))) {
verbosity = verbosityFromIntClamped(*val);
} else {
throw Error("expected a verbosity argument");
}
while (argvIt != argvEnd) {
const auto arg = getArg("option");
if (arg == "--") {
@@ -41,7 +47,8 @@ static int main_builtin_builder(AsyncIoRoot & aio, std::string programName, Stri
} else if (!arg.starts_with("--")) {
throw Error("unexpected builtin option %s", arg);
}
settings.set(arg.substr(2), unescapeNul(getArg(arg)));
auto value = unescapeNul(getArg(arg));
globalConfig.set(arg.substr(2), value);
}
while (argvIt != argvEnd) {
lix/libstore/build/local-derivation-goal.cc
+8 -4
View File
@@ -872,9 +872,13 @@ try {
if (drv->isBuiltin()) {
args.push_back("builtin-builder");
args.push_back(std::to_string(verbosity));
std::map<std::string, AbstractConfig::SettingInfo> overriddenSettings;
settings.getSettings(overriddenSettings, true);
std::map<std::string, AbstractConfig::SettingInfo> changedSettings;
globalConfig.getChangedSettings(changedSettings);
// we won't need them since we're launching *into* a sandbox, and the list is quite large
changedSettings.erase(settings.builtinBuilderSandboxPaths.name);
/* Make the contents of netrc and the CA certificate bundle
available to builtin:fetchurl (which may run under a
@@ -888,7 +892,7 @@ try {
}
if (!data.empty()) {
overriddenSettings[thing.name].value = tmpDirInSandbox + "/" + thing.name;
changedSettings[thing.name].value = tmpDirInSandbox + "/" + thing.name;
auto path = tmpDir + "/" + thing.name;
writeFile(path, data, 0600);
chownToBuilder(path);
@@ -899,7 +903,7 @@ try {
expose(settings.caFile);
}
for (const auto & [setting, value] : overriddenSettings) {
for (const auto & [setting, value] : changedSettings) {
args.push_back("--" + setting);
args.push_back(escapeNul(value.value));
}