summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware/fwupd
diff options
context:
space:
mode:
authorArthur Gautier <baloo@superbaloo.net>2021-02-16 01:50:46 +0000
committerArthur Gautier <baloo@superbaloo.net>2021-02-16 03:43:46 +0000
commitf30e159674d3a0ca9555d7aabfd6d9a10067fc06 (patch)
tree8a24c76240df8e1e8e1e1b70009582df2c9e8b54 /pkgs/os-specific/linux/firmware/fwupd
parent82abb66345f583001009f1be36f81c4082098011 (diff)
downloadnixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar.gz
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar.bz2
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar.lz
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar.xz
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.tar.zst
nixpkgs-f30e159674d3a0ca9555d7aabfd6d9a10067fc06.zip
fwupd: fix aarch64 build
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix8
1 files changed, 7 insertions, 1 deletions
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