puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix repl: Don't build in a child process

Browse source 
Fixes #5356. This is a bit risky due to interrupts, but we have to
deal with those anyway (#5353).
This commit is contained in:
Eelco Dolstra 2021-10-12 15:27:02 +02:00
parent 102d3d71c0
commit 9ebe02a81e
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nix/repl.cc
View file

@ -498,17 +498,11 @@ bool NixRepl::processLine(string line)
Path drvPathRaw = state->store->printStorePath(drvPath); Path drvPathRaw = state->store->printStorePath(drvPath);
if (command == ":b") { if (command == ":b") {
/* We could do the build in this process using buildPaths(), state->store->buildPaths({DerivedPath::Built{drvPath}});
but doing it in a child makes it easier to recover from auto drv = state->store->readDerivation(drvPath);
problems / SIGINT. */ logger->cout("\nThis derivation produced the following outputs:");
try { for (auto & i : drv.outputsAndOptPaths(*state->store))
runNix("nix", {"build", "--no-link", drvPathRaw}); logger->cout(" %s -> %s", i.first, state->store->printStorePath(*i.second.second));
auto drv = state->store->readDerivation(drvPath);
std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
for (auto & i : drv.outputsAndOptPaths(*state->store))
std::cout << fmt(" %s -> %s\n", i.first, state->store->printStorePath(*i.second.second));
} catch (ExecError &) {
}
} else if (command == ":i") { } else if (command == ":i") {
runNix("nix-env", {"-i", drvPathRaw}); runNix("nix-env", {"-i", drvPathRaw});
} else { } else {