* Pass the Mesa source tree.

svn path=/nixpkgs/trunk/; revision=8052

pkgs/development/libraries/mesa/default.nix

@@ -4,11 +4,10 @@ assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
   name = "mesa-6.5.2";
-  srcs = [
-    (fetchurl {
-      url = http://mesh.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.2.tar.bz2;
-      sha256 = "0pxq3zjfdgcpkc92cyzl9hskdmc8qxxp7b2smywixmb10jim0zqk";
-    })
+  src = fetchurl {
+    url = http://mesh.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-6.5.2.tar.bz2;
+    sha256 = "0pxq3zjfdgcpkc92cyzl9hskdmc8qxxp7b2smywixmb10jim0zqk";
+  };
 /*    (fetchurl {
       url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
@@ -17,7 +16,6 @@ stdenv.mkDerivation {
       url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     }) */
-  ];
   builder = ./builder.sh;
   buildInputs = [x11 libXmu libXi];
 }

pkgs/servers/x11/xorg/default.nix

@@ -2662,7 +2662,7 @@ rec {
       url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/xorg-server-X11R7.2-1.2.0.tar.bz2;
       sha256 = "023a13aay8gd09a7x1s6wndbsj3xr2ismsvgbsi9dz4g7nw8ga96";
     };
-    buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ];
+    buildInputs = [pkgconfig bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; 
   }) // {inherit bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto renderproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

@@ -39,6 +39,8 @@ $pcMap{"bdftopcf"} = "bdftopcf";
 $pcMap{"libxslt"} = "libxslt";
 
 
+$extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; ";
+
 $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
 
 $extraAttrs{"fontmiscmisc"} = " postInstall = \"ln -s \${fontalias}/lib/X11/fonts/misc/fonts.alias \$out/lib/X11/fonts/misc/fonts.alias\"; ";
@@ -169,7 +171,7 @@ while (<>) {
     process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
 
-    push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/;
+    #push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/;
     push @requires, "glproto" if $pkg =~ /xf86videoi810/;
     push @requires, "zlib" if $pkg =~ /xorgserver/;
     push @requires, "libxslt" if $pkg =~ /libxcb/;

pkgs/servers/x11/xorg/xorgserver.sh

@@ -0,0 +1,5 @@
+preConfigure=preConfigure
+preConfigure() {
+    unpackFile $mesaSrc
+    configureFlags="$configureFlags --with-mesa-source=$(ls -d $(pwd)/Mesa-*)"
+}