Unverified Commit e596e5cc authored by Alyssa Ross's avatar Alyssa Ross
Browse files

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 dda100f2 ("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.
parent 6e5af4a4

pkgs/development/libraries/mesa/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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

  ];