1 files changed, 7 insertions, 4 deletions
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;