public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113250 from baloo/baloo/fwupd/aarch64-build

Browse Source 
fwupd: fix aarch64 build
This commit is contained in:
Jan Tojnar 2021-02-16 05:36:29 +01:00 committed by GitHub
commit fbed952566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -74,6 +74,9 @@ let
# only redfish for x86_64 # only redfish for x86_64
haveRedfish = stdenv.isx86_64; haveRedfish = stdenv.isx86_64;
# only use msr if x86 (requires cpuid)
haveMSR = isx86;
# # Currently broken on Aarch64 # # Currently broken on Aarch64
# haveFlashrom = isx86; # haveFlashrom = isx86;
# Experimental # Experimental
@ -196,6 +199,8 @@ let
"-Dplugin_redfish=false" "-Dplugin_redfish=false"
] ++ lib.optionals haveFlashrom [ ] ++ lib.optionals haveFlashrom [
"-Dplugin_flashrom=true" "-Dplugin_flashrom=true"
] ++ lib.optionals (!haveMSR) [
"-Dplugin_msr=false"
]; ];
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
@ -277,7 +282,6 @@ let
passthru = { passthru = {
filesInstalledToEtc = [ filesInstalledToEtc = [
"fwupd/daemon.conf" "fwupd/daemon.conf"
"fwupd/redfish.conf"
"fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor.conf"
@ -294,6 +298,8 @@ let
"pki/fwupd-metadata/LVFS-CA.pem" "pki/fwupd-metadata/LVFS-CA.pem"
] ++ lib.optionals haveDell [ ] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf" "fwupd/remotes.d/dell-esrt.conf"
] ++ lib.optionals haveRedfish [
"fwupd/redfish.conf"
]; ];
# DisabledPlugins key in fwupd/daemon.conf # DisabledPlugins key in fwupd/daemon.conf