From 41ff4a4247ca66a9e6ff14f8470e35ea48219d13 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Thu, 17 Apr 2025 20:23:02 +0200
Subject: [PATCH] build-clan: fix constructing `nix-darwin` machines

---
 lib/build-clan/module.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/build-clan/module.nix b/lib/build-clan/module.nix
index 95d0af885..3d2a2f8bc 100644
--- a/lib/build-clan/module.nix
+++ b/lib/build-clan/module.nix
@@ -124,7 +124,7 @@ in
           (
             { _class, ... }:
             {
-              imports = (v.machineImports or [ ]) ++ [
+              imports = [
                 (lib.modules.importApply ./machineModules/forName.nix {
                   inherit (config.inventory) meta;
                   inherit
@@ -136,8 +136,8 @@ in
                 # We assume either:
                 # - nixosModules (_class = nixos)
                 # - 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)