pi stuff

modules/nixos/hardware/raspberry-pi/default.nix

@@ -276,13 +276,13 @@ in
     };
 
     system = {
-      build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo 
-      boot = {
-        loader = {
-          id = lib.mkOverride 60 (if cfg.bootType == "uefi" then "raspberrypi-uefi" else "raspberrypi-uboot"); # todo
-          kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
-        };
-      };
+      #build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo 
+      #boot = {
+      #  loader = {
+      #    id = lib.mkOverride 60 (if cfg.bootType == "uefi" then "raspberrypi-uefi" else "raspberrypi-uboot"); # todo
+      #    kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
+      #  };
+      #};
       # Pi specific system tags
       nixos.tags = [
         "raspberry-pi-${cfg.variant}"

modules/nixos/hardware/raspberry-pi/uefi-builder.sh

@@ -31,17 +31,20 @@ fi
 copyForced() {
     local src="$1"
     local dst="$2"
-    cp -r $src $dst.tmp
-    mv $dst.tmp $dst
+    echo "copying $file to $dst"
+    cp -a "$src/." $dst
+    #mv $dst.tmp $dst/$file
 }
 
+echo "uefi: @uefi@"
+
 if [ -n "$fwtarget" ]; then
     @firmwareBuilder@ -c $default -d $fwtarget
 
     echo "copying uefi firmware..."
-    for file in @uefi@; do
-        copyForced @uefi@/file $fwtarget/
-    done
+    #for file in "@uefi@/*"; do
+    copyForced @uefi@ $fwtarget/
+    #done
 fi
 
-echo "uefi bootloader installed"
+echo "uefi bootloader installed"

packages/raspberrypi/uefi-rpi4/default.nix

@@ -22,9 +22,9 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p "$out/firmware"
+    mkdir -p "$out"
 
-    cp -rv "${src}" "$out/firmware"
+    cp -rv "${src}/." "$out"
 
     runHook postInstall
   '';
@@ -35,4 +35,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
   };
-}
+}