yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'build-clan: fix constructing nix-darwin machines' (#3345) from push-rnzmyrvqrqmv into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3345
This commit is contained in:
Michael Hoang
2025-04-17 18:32:22 +00:00
parent 1aa392e5d3 40a3f6abce
commit c263d68653
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/build-clan/module.nix
View File

@@ -124,7 +124,7 @@ in
( (
{ _class, ... }: { _class, ... }:
{ {
imports = (v.machineImports or [ ]) ++ [ imports = [
(lib.modules.importApply ./machineModules/forName.nix { (lib.modules.importApply ./machineModules/forName.nix {
inherit (config.inventory) meta; inherit (config.inventory) meta;
inherit inherit
@@ -136,8 +136,8 @@ in
# We assume either: # We assume either:
# - nixosModules (_class = nixos) # - nixosModules (_class = nixos)
# - darwinModules (_class = darwin) # - darwinModules (_class = darwin)
(lib.optionalAttrs (clan-core."${_class}Modules" ? clanCore) clan-core."${_class}Modules".clanCore) (lib.optionalAttrs (clan-core ? "${_class}Modules") clan-core."${_class}Modules".clanCore)
]; ] ++ lib.optionals (_class == "nixos") (v.machineImports or [ ]);
} }
) )
) inventoryClass.machines) ) inventoryClass.machines)