Merge changes I29e66ad8,I77ea62cd,I7cd58d92 into main

* changes:
  treewide: make more settings conditionally available
  libstore/build: only send overridden settings to the build hook
  treewide: consistently mark overridden settings as such
This commit is contained in:
alois31
2024-10-23 15:20:51 +00:00
committed by Gerrit Code Review
22 changed files with 118 additions and 115 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ static Strings parseNixPath(const std::string & s)
EvalSettings::EvalSettings()
{
auto var = getEnv("NIX_PATH");
if (var) nixPath = parseNixPath(*var);
if (var) nixPath.setDefault(parseNixPath(*var));
}
Strings EvalSettings::getDefaultNixPath()