mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-07 18:38:44 +08:00
fydetab/duo: fix hardware.firmware being applied
This commit is contained in:
@@ -43,7 +43,8 @@ in
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = lib.mkMerge [
|
||||||
|
{
|
||||||
deviceTree = lib.mkMerge [
|
deviceTree = lib.mkMerge [
|
||||||
{
|
{
|
||||||
name = "rockchip/rk3588s-fydetab-duo.dtb";
|
name = "rockchip/rk3588s-fydetab-duo.dtb";
|
||||||
@@ -86,13 +87,24 @@ in
|
|||||||
rk3588.enable = true;
|
rk3588.enable = true;
|
||||||
platformFirmware = pkgs.callPackage ./u-boot.nix { };
|
platformFirmware = pkgs.callPackage ./u-boot.nix { };
|
||||||
};
|
};
|
||||||
firmware = lib.mkMerge [
|
}
|
||||||
|
(lib.mkIf config.networking.wireless.iwd.enable {
|
||||||
|
firmware = [
|
||||||
# Only iwd is supported by the interface
|
# 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 {
|
systemd.services.bluetooth-fydetab = lib.mkIf config.hardware.bluetooth.enable {
|
||||||
description = "FydeTab Duo Bluetooth fix";
|
description = "FydeTab Duo Bluetooth fix";
|
||||||
|
|||||||
Reference in New Issue
Block a user