From 24d090ded484b262107887225ac56ff48687164a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 20 Sep 2022 18:37:30 +0200 Subject: [PATCH] hw-probe: fix for aarch64 cpuid is only compatible with i686 and x86_64, so only add it as a dependency on those platforms. --- pkgs/tools/system/hw-probe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hw-probe/default.nix b/pkgs/tools/system/hw-probe/default.nix index 72bdbe368af0..73a414607aab 100644 --- a/pkgs/tools/system/hw-probe/default.nix +++ b/pkgs/tools/system/hw-probe/default.nix @@ -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)