* X11R7.3.

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

pkgs/development/libraries/mesa/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, x11, libXmu, libXi, makedepend, libdrm, glproto, libXxf86vm}:
+{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm}:
 
 let
 
@@ -10,15 +10,12 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mesa-6.5.2";
+  name = "mesa-7.0.1";
+  
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaLib-6.5.2.tar.bz2;
-    sha256 = "0pxq3zjfdgcpkc92cyzl9hskdmc8qxxp7b2smywixmb10jim0zqk";
+    url = mirror://sourceforge/mesa3d/MesaLib-7.0.1.tar.bz2;
+    md5 = "c056abd763e899114bf745c9eedbf9ad";
   };
-  buildFlags = "${target}";
-  preBuild = "
-    makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri)
-  ";
 /*    (fetchurl {
       url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
@@ -27,7 +24,22 @@ stdenv.mkDerivation {
       url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     }) */
-  buildInputs = [pkgconfig x11 libXmu libXi makedepend libdrm glproto libXxf86vm];
+  
+  buildFlags = "${target}";
+  
+  preBuild = "
+    makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL)
+  ";
+  
+  buildInputs = [
+    pkgconfig x11 xlibs.makedepend libdrm xlibs.glproto xlibs.libXmu
+    xlibs.libXi xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
+  ];
+  
   passthru = {inherit libdrm;};
-  meta = {description = "OpenGL-compatible 3D library. Supports acceleration.";};
+  
+  meta = {
+    description = "OpenGL-compatible 3D library. Supports acceleration.";
+    homepage = http://www.mesa3d.org/;
+  };
 }