add support for new style of defaults

This commit is contained in:
Artturin 2022-03-25 04:45:45 +02:00
parent b7547d3eed
commit aee797a673

View file

@ -189,9 +189,11 @@ in
rec { rec {
defaultNix = defaultNix =
result result
// (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {}); // (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {})
// (if result ? packages.${system}.default then { default = result.packages.${system}.default; } else {});
shellNix = shellNix =
defaultNix defaultNix
// (if result ? devShell.${system} then { default = result.devShell.${system}; } else {}); // (if result ? devShell.${system} then { default = result.devShell.${system}; } else {})
// (if result ? devShells.${system}.default then { default = result.devShells.${system}.default; } else {});
} }