From aee797a673956f9ac563ce8495db0ff7204cbaa3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 25 Mar 2022 04:45:45 +0200 Subject: [PATCH] add support for new style of defaults --- default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 1ffef45..eb9d1c3 100644 --- a/default.nix +++ b/default.nix @@ -189,9 +189,11 @@ in rec { defaultNix = 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 = 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 {}); }