diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 22:36:50 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 22:41:53 +0000 |
| commit | f4f3203aa7c2fc9225a8ae220db25593066fb397 (patch) | |
| tree | 9063673af148e34069dd894a2fd6a2981b13ff26 /src/nix-instantiate | |
| parent | 1b6cf0d5f56e166a1cbbf38142375b7a92fc88f2 (diff) | |
| parent | 6a8d6246f603a372d557ab026670ae42bad558b0 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/nix-instantiate')
| -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); |