From f30e159674d3a0ca9555d7aabfd6d9a10067fc06 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 16 Feb 2021 01:50:46 +0000 Subject: fwupd: fix aarch64 build Signed-off-by: Arthur Gautier --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/firmware/fwupd') diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 453d3ab9a47..2b35d609706 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -74,6 +74,9 @@ let # only redfish for x86_64 haveRedfish = stdenv.isx86_64; + # only use msr if x86 (requires cpuid) + haveMSR = isx86; + # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental @@ -196,6 +199,8 @@ let "-Dplugin_redfish=false" ] ++ lib.optionals haveFlashrom [ "-Dplugin_flashrom=true" + ] ++ lib.optionals (!haveMSR) [ + "-Dplugin_msr=false" ]; # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF @@ -277,7 +282,6 @@ let passthru = { filesInstalledToEtc = [ "fwupd/daemon.conf" - "fwupd/redfish.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" @@ -294,6 +298,8 @@ let "pki/fwupd-metadata/LVFS-CA.pem" ] ++ lib.optionals haveDell [ "fwupd/remotes.d/dell-esrt.conf" + ] ++ lib.optionals haveRedfish [ + "fwupd/redfish.conf" ]; # DisabledPlugins key in fwupd/daemon.conf -- cgit 1.4.1