1 files changed, 13 insertions, 1 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 453d3ab9a47a..bfa7783b6b83 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/infra/libkookie/nixpkgs/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
@@ -88,6 +91,12 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "fwupd";
+    # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
+    # released with 1.5.6.
+    # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
+    # Maintainer says a new release is to be expected in a few days:
+    #   https://twitter.com/hughsient/status/1362476792297185289
+    # In the mean time, please do not release 1.5.6 and go strait to 1.5.7
     version = "1.5.5";
 
     # libfwupd goes to lib
@@ -196,6 +205,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 +288,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 +304,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