lix-project/nix-eval-jobs
2
1
Fork 3
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'fix crash in worker when opening the store' (#4) from open-store-crash into main

Browse source 
Reviewed-on: #4
This commit is contained in:
raito 2024-05-11 15:49:35 +00:00
parent 2dbcbe4179 52e96bd421
commit 02bcbe0c0e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nix-eval-jobs.cc
View file

@ -66,8 +66,11 @@ struct Proc {
std::make_shared<AutoCloseFD>(std::move(toPipe.readSide))}]() { std::make_shared<AutoCloseFD>(std::move(toPipe.readSide))}]() {
debug("created worker process %d", getpid()); debug("created worker process %d", getpid());
try { try {
auto state = std::make_shared<EvalState>( auto evalStore = myArgs.evalStoreUrl
myArgs.searchPath, openStore(*myArgs.evalStoreUrl)); ? openStore(*myArgs.evalStoreUrl)
: openStore();
auto state = std::make_shared<EvalState>(myArgs.searchPath,
evalStore);
Bindings &autoArgs = *myArgs.getAutoArgs(*state); Bindings &autoArgs = *myArgs.getAutoArgs(*state);
proc(ref<EvalState>(state), autoArgs, *to, *from, myArgs); proc(ref<EvalState>(state), autoArgs, *to, *from, myArgs);
} catch (Error &e) { } catch (Error &e) {