From 9c04fcb25f633980b7cb4484d5138fe6fb11583f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 19 Jan 2023 16:40:53 +0000 Subject: [PATCH] valgrind: make meta.platforms more accurate Valgrind has to do lots of architecture- and OS-specific stuff, so it only works on a defined set of platforms. So rather than marking platforms as bad one by one, let's set meta.platforms to the actual set of platforms supported by Valgrind, as listed in its configure script. --- pkgs/development/tools/analysis/valgrind/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 25a7211ef49d..ea45813303a6 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -119,13 +119,9 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; - badPlatforms = [ - "armv5tel-linux" "armv6l-linux" "armv6m-linux" - "sparc-linux" "sparc64-linux" - "riscv32-linux" "riscv64-linux" - "alpha-linux" - ]; + platforms = with lib.platforms; lib.intersectLists + (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) + (darwin ++ freebsd ++ illumos ++ linux); broken = stdenv.isDarwin || stdenv.hostPlatform.isStatic; # https://hydra.nixos.org/build/128521440/nixlog/2 }; }