From e596e5cc9b9af0c635d765e2cc18435e97915f92 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Sep 2024 09:37:32 +0200
Subject: [PATCH] mesa: rename enableValgrind back to withValgrind

Yes, it's inconsistent with enablePatentEncumberedCodecs, but it's the
name this option had before it was removed in dda100f27bcd ("mesa:
split out the Darwin build into a separate expression, heavily clean
up Linux"), and therefore still has in stable.  There's no reason for
the name to change between NixOS releases just because it was
temporarily removed.
---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 39ed2e004bc2..dc722d44243f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -40,7 +40,7 @@
 , xorg
 , zstd
 , enablePatentEncumberedCodecs ? true
-, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light
+, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light
 
 , galliumDrivers ? [
     "d3d12" # WSL emulated GPU (aka Dozen)
@@ -215,7 +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.mesonEnable "valgrind" withValgrind)
   ] ++ lib.optionals enablePatentEncumberedCodecs [
     (lib.mesonOption "video-codecs" "all")
   ] ++ lib.optionals needNativeCLC [
@@ -255,7 +255,7 @@ in stdenv.mkDerivation {
     xcbutilkeysyms
     xorgproto
     zstd
-  ] ++ lib.optionals enableValgrind [
+  ] ++ lib.optionals withValgrind [
     valgrind-light
   ];