mesa: make X11-only dependencies conditional

1 files changed, 14 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 0a53ecaa2f61..c25c67a3f6e3 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -158,18 +158,22 @@ let self = stdenv.mkDerivation {
     python2 python2Packages.Mako
   ];
 
-  propagatedBuildInputs = with xorg; [
-    libXdamage libXxf86vm
-  ] ++ optional stdenv.isLinux libdrm
+  propagatedBuildInputs =
+    optionals (elem "x11" eglPlatforms) (with xorg; [ libXdamage libXxf86vm ])
+    ++ optional stdenv.isLinux libdrm
     ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
 
-  buildInputs = with xorg; [
-    expat llvmPackages.llvm libglvnd xorgproto
-    libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
-    libffi libvdpau libelf libXvMC
-    libpthreadstubs openssl /*or another sha1 provider*/
-  ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
-    ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ];
+  buildInputs = [ expat llvmPackages.llvm libglvnd libelf ]
+    ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
+    ++ optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
+
+    ++ optionals (elem "x11" eglPlatforms)
+      ((with xorg; [
+        xorgproto
+        libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
+        libffi libvdpau libXvMC
+        libpthreadstubs openssl /*or another sha1 provider*/
+      ]) ++ optional stdenv.isLinux valgrind-light);
 
   enableParallelBuilding = true;
   doCheck = false;