about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/mesa/default.nix
diff options
context:
space:
mode:
authorAlyssa <hi@alyssa.is>2019-04-18 20:09:18 +0200
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:05:49 +0000
commit1c05687da3525d18187e872fb05ef717d224a96d (patch)
treea2372ce2c37ed000fab5b75e7a458ddb8261b216 /nixpkgs/pkgs/development/libraries/mesa/default.nix
parentc017c017e721c488043e57167ec1bf67eff92bda (diff)
downloadnixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar.gz
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar.bz2
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar.lz
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar.xz
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.tar.zst
nixlib-1c05687da3525d18187e872fb05ef717d224a96d.zip
mesa: make valgrind support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index a576a32bb2e2..a07fc36d093a 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, autoreconfHook
 , expat, zlib, xorg, wayland, wayland-protocols, openssl
 , libffi
-, valgrind-light, python2, python2Packages
+, python2, python2Packages
 , enableRadv ? stdenv.isLinux
 , galliumDrivers ? null
 , driDrivers ? null
@@ -17,6 +17,7 @@
 , libelfSupport ? stdenv.isLinux, libelf
 , llvmSupport ? true, llvmPackages
 , libglvndSupport ? true, libglvnd
+, valgrindSupport ? stdenv.isLinux, valgrind-light
 
 , OpenGL, Xplugin
 }:
@@ -216,7 +217,7 @@ let self = stdenv.mkDerivation {
         libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
         libffi
         libpthreadstubs openssl /*or another sha1 provider*/
-      ]) ++ optional stdenv.isLinux valgrind-light);
+      ]) ++ optional valgrindSupport valgrind-light);
 
   enableParallelBuilding = true;
   doCheck = false;