diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 23:47:53 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 23:47:53 +0000 |
| commit | 1ef88da3503b88f289a15786dfd48821cf5b6502 (patch) | |
| tree | aef8833d734cf1f892b27a54ae969641a20c9d7b /src/nix-instantiate/nix-instantiate.cc | |
| parent | 8499f32fb2e7fdf09e97d0beb1fe78bef5900d93 (diff) | |
| parent | 6a8d6246f603a372d557ab026670ae42bad558b0 (diff) | |
Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs
Diffstat (limited to 'src/nix-instantiate/nix-instantiate.cc')
| -rw-r--r-- | src/nix-instantiate/nix-instantiate.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index 95903d882..25d0fa3ba 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -153,8 +153,9 @@ static int main_nix_instantiate(int argc, char * * argv) settings.readOnlyMode = true; auto store = openStore(); + auto evalStore = myArgs.evalStoreUrl ? openStore(*myArgs.evalStoreUrl) : store; - auto state = std::make_unique<EvalState>(myArgs.searchPath, store); + auto state = std::make_unique<EvalState>(myArgs.searchPath, evalStore, store); state->repair = repair; Bindings & autoArgs = *myArgs.getAutoArgs(*state); |