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

de-inheritance CmdSearch for InstallableValueCommand

Browse source 
Change-Id: I125c8cac05c8e924b55e4eb1060496e35ea4e941
This commit is contained in:
Qyriad 2024-06-17 14:41:22 -06:00
parent 50be55ffca
commit 6515b1a495
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix/search.cc
View file

@ -1,4 +1,4 @@
#include "command-installable-value.hh" #include "command.hh"
#include "globals.hh" #include "globals.hh"
#include "eval.hh" #include "eval.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
@ -23,7 +23,7 @@ std::string wrap(std::string prefix, std::string s)
return concatStrings(prefix, s, ANSI_NORMAL); return concatStrings(prefix, s, ANSI_NORMAL);
} }
struct CmdSearch : InstallableValueCommand, MixJSON struct CmdSearch : InstallableCommand, MixJSON
{ {
std::vector<std::string> res; std::vector<std::string> res;
std::vector<std::string> excludeRes; std::vector<std::string> excludeRes;
@ -62,8 +62,10 @@ struct CmdSearch : InstallableValueCommand, MixJSON
}; };
} }
void run(ref<Store> store, ref<InstallableValue> installable) override void run(ref<Store> store, ref<Installable> installable) override
{ {
auto const installableValue = InstallableValue::require(installable);
settings.readOnlyMode = true; settings.readOnlyMode = true;
evalSettings.enableImportFromDerivation.setDefault(false); evalSettings.enableImportFromDerivation.setDefault(false);
@ -192,7 +194,7 @@ struct CmdSearch : InstallableValueCommand, MixJSON
} }
}; };
for (auto & cursor : installable->getCursors(*state)) for (auto & cursor : installableValue->getCursors(*state))
visit(*cursor, cursor->getAttrPath(), true); visit(*cursor, cursor->getAttrPath(), true);
if (json) if (json)