Replace defaultBla.$system with bla.$system.default

This also simplifies some InstallableFlake logic and fixes 'nix bundle' parsing its installable twice. Fixes #5532.
2022-02-22 11:47:41 +01:00
parent caf5172945
commit 162fbe31ff
9 changed files with 61 additions and 41 deletions
@@ -158,7 +158,10 @@ SourceExprCommand::SourceExprCommand()

 Strings SourceExprCommand::getDefaultFlakeAttrPaths()
 {
-    return {"defaultPackage." + settings.thisSystem.get()};
+    return {
+        "packages." + settings.thisSystem.get() + ".default",
+        "defaultPackage." + settings.thisSystem.get()
+    };
 }

 Strings SourceExprCommand::getDefaultFlakeAttrPathPrefixes()