diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-08-23 11:05:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2021-08-23 11:05:16 +0200 |
| commit | 440d1ac718f9ca4a896942c45740feae3d9b1963 (patch) | |
| tree | 4e8eae1ecd5998cc14c9a1a5030cd921e720a716 | |
| parent | 7a54b10a8a29dadea2bb2c639a15cfec25a4d38c (diff) | |
| parent | 2d66a31f015a26f182f8a70fa09c635d1c7a1739 (diff) | |
Merge branch 'fix-attr-path-prefixes' of https://github.com/jtojnar/nix
| -rw-r--r-- | src/nix/bundle.cc | 2 | ||||
| -rw-r--r-- | src/nix/develop.cc | 2 | ||||
| -rw-r--r-- | src/nix/run.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc index cedb5704c..aca024bca 100644 --- a/src/nix/bundle.cc +++ b/src/nix/bundle.cc @@ -59,7 +59,7 @@ struct CmdBundle : InstallableCommand Strings getDefaultFlakeAttrPathPrefixes() override { - Strings res{"apps." + settings.thisSystem.get() + ".", "packages"}; + Strings res{"apps." + settings.thisSystem.get() + "."}; for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes()) res.push_back(s); return res; diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 55023545d..c823f16c8 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -330,7 +330,7 @@ struct Common : InstallableCommand, MixProfile Strings getDefaultFlakeAttrPathPrefixes() override { auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes(); - res.emplace_front("devShells." + settings.thisSystem.get()); + res.emplace_front("devShells." + settings.thisSystem.get() + "."); return res; } diff --git a/src/nix/run.cc b/src/nix/run.cc index 7597b61f7..b01fdebaa 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -167,7 +167,7 @@ struct CmdRun : InstallableCommand Strings getDefaultFlakeAttrPathPrefixes() override { - Strings res{"apps." + settings.thisSystem.get() + ".", "packages"}; + Strings res{"apps." + settings.thisSystem.get() + "."}; for (auto & s : SourceExprCommand::getDefaultFlakeAttrPathPrefixes()) res.push_back(s); return res; |