diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 4a13cf68a88..e28680c245f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -21,7 +21,7 @@ , enableLdap ? true, openldap , enableNetworkManager ? true, networkmanager , enableLibetpan ? true, libetpan -, enableValgrind ? true, valgrind +, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind , enableSvg ? true, librsvg # Configure claws-mail's plugins diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 558fa45a1fd..d64349eaa93 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -28,7 +28,7 @@ let , embedSupport ? false , ipv6Support ? true , systemdSupport ? stdenv.isLinux - , valgrindSupport ? !stdenv.isDarwin + , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e68219f6348..85afe93ea7a 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -14,7 +14,9 @@ , publicsuffix-list }: -stdenv.mkDerivation rec { +let + enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind; +in stdenv.mkDerivation rec { pname = "libpsl"; version = "0.21.0"; @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config python3 libxslt - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals enableValgrindTests [ valgrind ]; @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals enableValgrindTests [ "--enable-valgrind-tests" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3c7ea16b26a..01d73543653 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -10,7 +10,7 @@ , vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin -, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light +, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux }: diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5575c1d429c..744e40c95dd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -364,7 +364,7 @@ lib.makeScope pkgs.newScope (self: with self; { # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre2 ] ++ lib.optionals (lib.versionAtLeast php.version "8.0" && !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) [ valgrind.dev ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [