nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-24 19:29:36 +01:00
Code Activity

Merge commit '46d86e06ba' into progress-bar

Browse source
This commit is contained in:
John Ericson 2023-03-11 17:02:16 -05:00
commit 2f5a4df00c
25 changed files with 137 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libcmd/command.cc
View file

@ -73,8 +73,13 @@ ref<Store> EvalCommand::getEvalStore()
ref<EvalState> EvalCommand::getEvalState()
{
if (!evalState)
evalState = std::make_shared<EvalState>(searchPath, getEvalStore(), getStore());
if (!evalState) evalState =
#if HAVE_BOEHMGC
std::allocate_shared<EvalState>(traceable_allocator<EvalState>(),
#else
std::make_shared<EvalState>(
#endif
searchPath, getEvalStore(), getStore());
return ref<EvalState>(evalState);
}