From 6d4718efa23ee1304597403e93678affda398a04 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 20 Apr 2019 21:14:44 +0200
Subject: mesa: only include X libraries as required

---
 nixpkgs/pkgs/development/libraries/mesa/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')

diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 4be9fbd83d02..2c9f1f3570b8 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -212,10 +212,13 @@ let self = stdenv.mkDerivation {
     ++ optional valgrindSupport valgrind-light
 
     ++ optionals (elem "x11" eglPlatforms)
-      (with xorg; [
-        xorgproto
-        libX11 libXext libxcb libxshmfence libXrandr
-      ]);
+      ((with xorg; [ xorgproto libX11 ]))
+
+    ++ optionals (elem "x11" eglPlatforms && libdrmSupport)
+      (with xorg; [ libXext libxcb libxshmfence ])
+
+    ++ optional (elem "x11" eglPlatforms && elem "drm" eglPlatforms)
+      xorg.libXrandr;
 
   enableParallelBuilding = true;
   doCheck = false;
-- 
cgit 1.4.1