Merge pull request #192276 from Luflosi/fix-hw-probe-aarch64

hw-probe: fix for aarch64
This commit is contained in:
Mario Rodas 2022-09-29 21:52:25 -05:00 committed by GitHub
commit 1bf731153e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
mesa-demos
memtester
sysstat # (iostat)
cpuid
util-linuxMinimal # (rfkill)
xinput
libva-utils # (vainfo)
@ -108,7 +107,9 @@ stdenv.mkDerivation rec {
vulkan-utils
i2c-tools
opensc
];
]
# cpuid is only compatible with i686 and x86_64
++ lib.optional (lib.elem stdenv.hostPlatform.system cpuid.meta.platforms) cpuid;
conditionallyRecommendedPrograms = lib.optional systemdSupport systemd; # (systemd-analyze)
suggestedPrograms = [
hplip # (hp-probe)