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

Move addRegistrOverrides

Browse source
This commit is contained in:
Eelco Dolstra 2019-10-08 16:44:09 +02:00
parent 21304c11f9
commit a0bd088d84
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/build.cc
View file

@ -52,8 +52,6 @@ struct CmdBuild : MixDryRun, MixProfile, InstallablesCommand
{ {
auto buildables = build(store, dryRun ? DryRun : Build, installables); auto buildables = build(store, dryRun ? DryRun : Build, installables);
auto evalState = std::make_shared<EvalState>(searchPath, store);
evalState->addRegistryOverrides(registryOverrides);
if (dryRun) return; if (dryRun) return;
if (outLink != "") { if (outLink != "") {

1
src/nix/flake.cc
View file

@ -129,7 +129,6 @@ struct CmdFlakeDeps : FlakeCommand
void run(nix::ref<nix::Store> store) override void run(nix::ref<nix::Store> store) override
{ {
auto evalState = getEvalState(); auto evalState = getEvalState();
evalState->addRegistryOverrides(registryOverrides);
std::queue<ResolvedFlake> todo; std::queue<ResolvedFlake> todo;
todo.push(resolveFlake()); todo.push(resolveFlake());

4
src/nix/installables.cc
View file

@ -56,8 +56,10 @@ SourceExprCommand::SourceExprCommand()
ref<EvalState> EvalCommand::getEvalState() ref<EvalState> EvalCommand::getEvalState()
{ {
if (!evalState) if (!evalState) {
evalState = std::make_shared<EvalState>(searchPath, getStore()); evalState = std::make_shared<EvalState>(searchPath, getStore());
evalState->addRegistryOverrides(registryOverrides);
}
return ref<EvalState>(evalState); return ref<EvalState>(evalState);
} }