From eda474f7d6d08bd5448fc94cf55a30a95e51fccd Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 12 Aug 2025 15:59:58 +0800 Subject: [PATCH] fix aarch64 build --- devices/r2s/default.nix | 1 + modules/system/grub.nix | 8 +++++++- modules/system/kernel/default.nix | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/devices/r2s/default.nix b/devices/r2s/default.nix index 87304b33..c1f547d7 100644 --- a/devices/r2s/default.nix +++ b/devices/r2s/default.nix @@ -13,6 +13,7 @@ inputs: swap = [ "/nix/swap/swap" ]; }; network = {}; + grub = null; }; services = { diff --git a/modules/system/grub.nix b/modules/system/grub.nix index 98aa0de8..c7b51d0d 100644 --- a/modules/system/grub.nix +++ b/modules/system/grub.nix @@ -83,5 +83,11 @@ inputs: }; } ]) - ({}); + ({ + boot.loader = + { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + }); } diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 909c85c1..e2d6b69d 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -39,7 +39,11 @@ inputs: "bridge" ] ++ (inputs.lib.optionals (kernel.variant != "nixos") [ "crypto_simd" ]); - extraModulePackages = with inputs.config.boot.kernelPackages; [ v4l2loopback zenpower ]; + extraModulePackages = with inputs.config.boot.kernelPackages; + [ + v4l2loopback + (if inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64" then zenpower else inputs.pkgs.emptyDirectory) + ]; # force i2c-hid-acpi to load after pinctrl-tigerlake extraModprobeConfig = "softdep i2c-hid-acpi pre: pinctrl-tigerlake"; kernelParams = [ "delayacct" ];