forked from lix-project/lix
Merge branch 'fix-attr-path-prefixes' of https://github.com/jtojnar/nix
This commit is contained in:
commit
440d1ac718
src/nix
|
@ -59,7 +59,7 @@ struct CmdBundle : InstallableCommand
|
||||||
|
|
||||||
Strings getDefaultFlakeAttrPathPrefixes() override
|
Strings getDefaultFlakeAttrPathPrefixes() override
|
||||||
{
|
{
|
||||||
Strings res{"apps." + settings.thisSystem.get() + ".", "packages"};
|
Strings res{"apps." + settings.thisSystem.get() + "."};
|
||||||
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes())
|
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes())
|
||||||
res.push_back(s);
|
res.push_back(s);
|
||||||
return res;
|
return res;
|
||||||
|
|
|
@ -330,7 +330,7 @@ struct Common : InstallableCommand, MixProfile
|
||||||
Strings getDefaultFlakeAttrPathPrefixes() override
|
Strings getDefaultFlakeAttrPathPrefixes() override
|
||||||
{
|
{
|
||||||
auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes();
|
auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes();
|
||||||
res.emplace_front("devShells." + settings.thisSystem.get());
|
res.emplace_front("devShells." + settings.thisSystem.get() + ".");
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,7 @@ struct CmdRun : InstallableCommand
|
||||||
|
|
||||||
Strings getDefaultFlakeAttrPathPrefixes() override
|
Strings getDefaultFlakeAttrPathPrefixes() override
|
||||||
{
|
{
|
||||||
Strings res{"apps." + settings.thisSystem.get() + ".", "packages"};
|
Strings res{"apps." + settings.thisSystem.get() + "."};
|
||||||
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes())
|
for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes())
|
||||||
res.push_back(s);
|
res.push_back(s);
|
||||||
return res;
|
return res;
|
||||||
|
|
Loading…
Reference in a new issue