From 63b302156f40f3a2ed5dafb8ff4d61a4e5a60817 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 24 Aug 2024 14:44:21 -0400 Subject: [PATCH] mesa: only build with valgrind if available on host platform (#337065) --- pkgs/development/libraries/mesa/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ca75bc6a8cf1..39ed2e004bc2 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -40,6 +40,7 @@ , xorg , zstd , enablePatentEncumberedCodecs ? true +, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light , galliumDrivers ? [ "d3d12" # WSL emulated GPU (aka Dozen) @@ -214,6 +215,7 @@ in stdenv.mkDerivation { # meson auto_features enables this, but we do not want it (lib.mesonEnable "android-libbacktrace" false) (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) + (lib.mesonEnable "valgrind" enableValgrind) ] ++ lib.optionals enablePatentEncumberedCodecs [ (lib.mesonOption "video-codecs" "all") ] ++ lib.optionals needNativeCLC [ @@ -247,13 +249,14 @@ in stdenv.mkDerivation { python3Packages.python # for shebang spirv-llvm-translator udev - valgrind-light vulkan-loader wayland wayland-protocols xcbutilkeysyms xorgproto zstd + ] ++ lib.optionals enableValgrind [ + valgrind-light ]; depsBuildBuild = [