nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

Factor out a new DesugaredEnv from DerivationBuildingGoal

Browse source 
Now we have better separation of the core logic --- an integral part of
the store layer spec even --- from the goal mechanism and other
minutiae.

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
John Ericson 2025-08-27 15:52:51 -04:00
parent c2782d7b84
commit 53c31c8b29
8 changed files with 158 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@
#include "nix/store/restricted-store.hh"
#include "nix/store/user-lock.hh"
#include "nix/store/globals.hh"
#include "nix/store/build/derivation-env-desugar.hh"
#include <queue>
@ -992,19 +993,13 @@ void DerivationBuilderImpl::initEnv()
/* Write the final environment. Note that this is intentionally
*not* `drv.env`, because we've desugared things like like
"passAFile", "expandReferencesGraph", structured attrs, etc. */
for (const auto & [name, info] : finalEnv) {
if (info.nameOfPassAsFile) {
auto & fileName = *info.nameOfPassAsFile;
writeBuilderFile(fileName, rewriteStrings(info.value, inputRewrites));
env[name] = tmpDirInSandbox() + "/" + fileName;
} else {
env[name] = info.value;
}
for (const auto & [name, info] : desugaredEnv.variables) {
env[name] = info.prependBuildDirectory ? tmpDirInSandbox() + "/" + info.value : info.value;
}
/* Add extra files, similar to `finalEnv` */
for (const auto & [fileName, value] : extraFiles) {
writeBuilderFile(fileName, value);
for (const auto & [fileName, value] : desugaredEnv.extraFiles) {
writeBuilderFile(fileName, rewriteStrings(value, inputRewrites));
}
/* For convenience, set an environment pointing to the top build