lix-project/flake-compat
16
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #37 from Artturin/addsupportfornewshcmea

Browse source 
add support for new style of defaults
This commit is contained in:
Eelco Dolstra 2022-03-25 10:10:09 +01:00 committed by GitHub
parent 913e1270ff aee797a673
commit 64a525ee38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -190,9 +190,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 {});
} }