From 996cc009c64bb5039308efc0656e55eb9bafa25b Mon Sep 17 00:00:00 2001 From: Marian Hammer Date: Thu, 8 Jun 2023 15:49:41 +0200 Subject: mesa: fix build without valgrind Since the update to mesa v23.1.1 the build without valgrind was broken. This is a result of a change in mesa meson_options.txt which made the valgrind support a feature in mesa: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3f10a89180b5638d2c1870e91e06aeae67925717#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa_1844_1829 So it must be explicitly turned off as it is now on by default. --- pkgs/development/libraries/mesa/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries/mesa') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 38afcd174db..d56b34432d7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -210,6 +210,8 @@ self = stdenv.mkDerivation { # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" + ] ++ lib.optionals (!withValgrind) [ + "-Dvalgrind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; -- cgit 1.4.1