diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-02-11 18:11:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-02-22 11:47:41 +0100 |
| commit | 162fbe31ffe4c2b2d7648e5df2d5a0c9b4a44996 (patch) | |
| tree | 583872a69ddbd873b4c08dcd61ab68f9e2a0443c /src/nix/develop.cc | |
| parent | caf51729450d4c57d48ddbef8e855e9bf65f8792 (diff) | |
Replace defaultBla.$system with bla.$system.default
This also simplifies some InstallableFlake logic and fixes 'nix
bundle' parsing its installable twice.
Fixes #5532.
Diffstat (limited to 'src/nix/develop.cc')
| -rw-r--r-- | src/nix/develop.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nix/develop.cc b/src/nix/develop.cc index f88f5909c..92e31599a 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -325,8 +325,15 @@ struct Common : InstallableCommand, MixProfile Strings getDefaultFlakeAttrPaths() override { - return {"devShell." + settings.thisSystem.get(), "defaultPackage." + settings.thisSystem.get()}; + Strings paths{ + "devShells." + settings.thisSystem.get() + ".default", + "devShell." + settings.thisSystem.get(), + }; + for (auto & p : SourceExprCommand::getDefaultFlakeAttrPaths()) + paths.push_back(p); + return paths; } + Strings getDefaultFlakeAttrPathPrefixes() override { auto res = SourceExprCommand::getDefaultFlakeAttrPathPrefixes(); |