cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mesa: disable withValgrind if valgrind-light is marked as broken

Browse source 
`valgrind` derivation is currently marked as broken in either:
- `stdenv.isDarwin`
- `stdenv.hostPlatform.isStatic`

Instead of adding those two checks in the `mesa` derivation, we can just
check the current `valgrind-light.meta.broken` attribute.
This commit is contained in:
Thiago Kenji Okada 2022-04-19 21:46:17 +01:00
parent 582a42ece7
commit 67ae929deb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/mesa/default.nix
View file

@ -9,7 +9,7 @@
, vulkanDrivers ? ["auto"] , vulkanDrivers ? ["auto"]
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ]
, OpenGL, Xplugin , OpenGL, Xplugin
, withValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light
, enableGalliumNine ? stdenv.isLinux , enableGalliumNine ? stdenv.isLinux
, enableOSMesa ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux
, enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64