aboutsummaryrefslogtreecommitdiff
path: root/src/nix/run.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2021-07-16 16:04:47 +0200
committerEelco Dolstra <edolstra@gmail.com>2021-07-22 09:59:51 +0200
commit8d9f7048cd3b09fb58f6bad0328f644b0ddaaa16 (patch)
tree18a10edb9f4c675bb4c5b88dfdea121a9c92c425 /src/nix/run.cc
parent95e915a993f77cf17124f7866b542939c03d375a (diff)
Use eval-store in more places
In particular, this now works: $ nix path-info --eval-store auto --store https://cache.nixos.org nixpkgs#hello Previously this would fail as it would try to upload the hello .drv to cache.nixos.org. Now the .drv is instantiated in the local store, and then we check for the existence of the outputs in cache.nixos.org.
Diffstat (limited to 'src/nix/run.cc')
-rw-r--r--src/nix/run.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc
index c0ba05a3e..0c8afec2d 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -93,7 +93,7 @@ struct CmdShell : InstallablesCommand, RunCommon, MixEnvironment
void run(ref<Store> store) override
{
- auto outPaths = toStorePaths(store, Realise::Outputs, OperateOn::Output, installables);
+ auto outPaths = toStorePaths(getEvalStore(), store, Realise::Outputs, OperateOn::Output, installables);
auto accessor = store->getFSAccessor();
@@ -178,7 +178,7 @@ struct CmdRun : InstallableCommand, RunCommon
{
auto state = getEvalState();
- auto app = installable->toApp(*state).resolve(store);
+ auto app = installable->toApp(*state).resolve(getEvalStore(), store);
Strings allArgs{app.program};
for (auto & i : args) allArgs.push_back(i);