Skip to content

mesa: only build with valgrind if available on host platform #337065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NickCao wants to merge 1 commit into from
Closed

mesa: only build with valgrind if available on host platform #337065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkgs/development/libraries/mesa/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
, xorg
, zstd
, enablePatentEncumberedCodecs ? true
, enableValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light

, galliumDrivers ? [
"d3d12" # WSL emulated GPU (aka Dozen)
Expand Down Expand Up @@ -215,6 +216,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 [
Expand Down Expand Up @@ -248,13 +250,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 = [
Expand Down