diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-16 06:16:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-16 06:16:35 +0000 |
commit | 60a01d886e8ffa85e3b999e165406b17aa0810c8 (patch) | |
tree | c2487ab16582332e44388d8a4869f5d3d3f1ef11 /pkgs/os-specific | |
parent | 6453fff3defc5164c01d598e428517a4dc46d5d1 (diff) | |
parent | b02948e6bf0c9c425c54bfcfe2baf67bf27b0660 (diff) | |
download | nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar.gz nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar.bz2 nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar.lz nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar.xz nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.tar.zst nixpkgs-60a01d886e8ffa85e3b999e165406b17aa0810c8.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 8 |
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 |