nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 14:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

local-derivation-goal: Refactor

Browse Source 
This works because the `builder` and `args` variables are only used
in the non-builtin code path.

Co-Authored-By: Théophane Hufschmitt <theophane.hufschmitt@tweag.io>
This commit is contained in:
Robert Hensing 2024-10-03 12:50:27 +02:00
parent 14d09e0b55
commit 06e27042e1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstore/unix/build/local-derivation-goal.cc
View File

@ -2214,15 +2214,12 @@ void LocalDerivationGoal::runChild()
_exit(1); _exit(1);
} }
} }
#endif
builder = drv->builder;
args.push_back(std::string(baseNameOf(drv->builder)));
#else
if (!drv->isBuiltin()) { if (!drv->isBuiltin()) {
builder = drv->builder; builder = drv->builder;
args.push_back(std::string(baseNameOf(drv->builder))); args.push_back(std::string(baseNameOf(drv->builder)));
} }
#endif
for (auto & i : drv->args) for (auto & i : drv->args)
args.push_back(rewriteStrings(i, inputRewrites)); args.push_back(rewriteStrings(i, inputRewrites));