From c281bd071aa68dc67abb6e0c6db561362a0edf49 Mon Sep 17 00:00:00 2001
From: Josh Buker <git-commit@joshbuker.com>
Date: Wed, 28 Jan 2026 22:59:36 -0800
Subject: [PATCH] Try rawdogging sdImage and see if it breaks nixos-rebuild
 switch

---
 hardkernel/odroid-m1/petitboot/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/hardkernel/odroid-m1/petitboot/default.nix b/hardkernel/odroid-m1/petitboot/default.nix
index ab37b1f..38ff43e 100644
--- a/hardkernel/odroid-m1/petitboot/default.nix
+++ b/hardkernel/odroid-m1/petitboot/default.nix
@@ -60,16 +60,11 @@ in
     };
   };
 
-  config = lib.mkMerge[
-    (lib.mkIf config.boot.loader.petitboot.enable {
-      system.build.installBootLoader = lib.mkForce "${installer} ${args} -c";
-      system.boot.loader.id = "petitboot";
-    })
-
-    (lib.mkIf (config.boot.loader.petitboot.enable && options ? sdImage) {
-      sdImage.populateRootCommands = lib.mkForce ''
-        ${sdImageInstaller} ${args} -c ${config.system.build.toplevel} -d ./files/kboot.conf
-      '';
-    })
-  ];
+  config = lib.mkIf config.boot.loader.petitboot.enable {
+    system.build.installBootLoader = lib.mkForce "${installer} ${args} -c";
+    system.boot.loader.id = "petitboot";
+    sdImage.populateRootCommands = lib.mkForce ''
+      ${sdImageInstaller} ${args} -c ${config.system.build.toplevel} -d ./files/kboot.conf
+    '';
+  };
 }