Merge pull request #1605 from RossComputerGuy/fix/fyde

fydetab/duo: fix hardware.firmware being applied

fydetab/duo/README.md

@@ -5,6 +5,8 @@ The Fydetab Duo is an open source and hackable tablet by FydeOS.
 ## Features
 
 - Display: **works**
+  - X11: **untested**
+  - Wayland: **not working** (niri, sway, COSMIC)
 - GPU driver: **not working**
 - WiFi: **working**
 - Cellular: **untested**

fydetab/duo/config

@@ -6540,7 +6540,7 @@ CONFIG_HID_WIIMOTE=m
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
+CONFIG_HID_SENSOR_HUB=m
 # CONFIG_HID_ALPS is not set
 # CONFIG_HID_MCP2221 is not set
 # end of Special HID drivers

fydetab/duo/default.nix

@@ -43,7 +43,8 @@ in
       })
     ];
 
-    hardware = {
+    hardware = lib.mkMerge [
+      {
         deviceTree = lib.mkMerge [
           {
             name = "rockchip/rk3588s-fydetab-duo.dtb";
@@ -86,13 +87,24 @@ in
           rk3588.enable = true;
           platformFirmware = pkgs.callPackage ./u-boot.nix { };
         };
-      firmware = lib.mkMerge [
+      }
+      (lib.mkIf config.networking.wireless.iwd.enable {
+        firmware = [
           # Only iwd is supported by the interface
-        (lib.mkIf config.networking.wireless.iwd.enable ap6275pFirmware)
+          ap6275pFirmware
-        (lib.mkIf config.hardware.graphics.enable (pkgs.callPackage ./mali-g610.nix { }))
+        ];
-        (lib.mkIf config.hardware.sensor.iio.enable (pkgs.callPackage ./himax.nix { }))
+      })
+      (lib.mkIf config.hardware.graphics.enable {
+        firmware = [
+          (pkgs.callPackage ./mali-g610.nix { })
+        ];
+      })
+      (lib.mkIf config.hardware.sensor.iio.enable {
+        firmware = [
+          (pkgs.callPackage ./himax.nix { })
+        ];
+      })
     ];
-    };
 
     systemd.services.bluetooth-fydetab = lib.mkIf config.hardware.bluetooth.enable {
       description = "FydeTab Duo Bluetooth fix";

fydetab/duo/himax.nix

@@ -9,6 +9,7 @@ stdenv.mkDerivation (_finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/Linux-for-Fydetab-Duo/pkgbuilds/raw/f4c012bd42d87f677370f987f703982d53cd233d/fydetabduo-post-install/Himax_firmware.bin";
+    hash = "sha256-z0p/zXcNTBdhKCV6GmM2C8C02lu4Wkb2HP+Ir/nQJTc=";
   };
 
   compressFirmware = false;