lix-project/lix
20
57
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

de-inheritance CmdRun for InstallableValueCommand

Browse source 
Change-Id: Ief858c1488197211e2ee8b70aa40ed6c65743558
This commit is contained in:
Qyriad 2024-06-17 14:37:57 -06:00
parent b9e9235ac0
commit 079eeb1de7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nix/run.cc
View file

@ -1,6 +1,7 @@
#include "run.hh" #include "run.hh"
#include "command-installable-value.hh" #include "command.hh"
#include "common-args.hh" #include "common-args.hh"
#include "installables.hh"
#include "shared.hh" #include "shared.hh"
#include "store-api.hh" #include "store-api.hh"
#include "derivations.hh" #include "derivations.hh"
@ -145,7 +146,7 @@ struct CmdShell : InstallablesCommand, MixEnvironment
static auto rCmdShell = registerCommand<CmdShell>("shell"); static auto rCmdShell = registerCommand<CmdShell>("shell");
struct CmdRun : InstallableValueCommand struct CmdRun : InstallableCommand
{ {
using InstallableCommand::run; using InstallableCommand::run;
@ -191,12 +192,14 @@ struct CmdRun : InstallableValueCommand
return res; return res;
} }
void run(ref<Store> store, ref<InstallableValue> installable) override void run(ref<Store> store, ref<Installable> installable) override
{ {
auto state = getEvalState(); auto state = getEvalState();
auto installableValue = InstallableValue::require(installable);
lockFlags.applyNixConfig = true; lockFlags.applyNixConfig = true;
auto app = installable->toApp(*state).resolve(getEvalStore(), store); auto app = installableValue->toApp(*state).resolve(getEvalStore(), store);
Strings allArgs{app.program}; Strings allArgs{app.program};
for (auto & i : args) allArgs.push_back(i); for (auto & i : args) allArgs.push_back(i);