From b2ef0fe15587c18667b9101408e081c4643975ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 14:26:36 +0200
Subject: [PATCH] mesa: Don't propagate build inputs

It's generally undesirable because it causes unnecessary runtime
dependencies.
---
 pkgs/development/libraries/mesa/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index de130d465c2..537f4dc6155 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -81,17 +81,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
 
-  propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]
-  ++
-  stdenv.lib.optionals stdenv.isLinux [libdrm]
-  ;
-  buildInputs = with xorg; [
-    autoconf automake libtool intltool expat libxml2Python llvm
-    libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland
-  ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
-  ++ stdenv.lib.optional stdenv.isLinux [udev]
-  ;
+  buildInputs = with xorg;
+    [ autoconf automake libtool intltool expat libxml2Python llvm
+      libXfixes glproto dri2proto libX11 libXext libxcb libXt libXdamage libXxf86vm 
+      libffi wayland
+    ]
+    ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
+    ++ stdenv.lib.optional stdenv.isLinux [ libdrm udev ];
 
   enableParallelBuilding = true;
   doCheck = true;