* Mesa 7.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13004

2 files changed, 9 insertions, 30 deletions

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9b78d5463712..c44ff082720e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm}:
+{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}:
 
 let
 
@@ -7,40 +7,19 @@ let
     if stdenv.system == "x86_64-linux" then "linux-dri-x86-64" else
     abort "unsupported platform for Mesa"; # !!! change to throw, remove all the mesa asserts in all-packages.nix
 
-  # Missing file in 7.0.2. Can be removed for >= 7.0.3.
-  missingPC = fetchurl {
-    url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/mesa/files/7.0.2-glw.pc.in?rev=1.1";
-    sha256 = "1z4d50pllwi8g6n567dk3zxq4qmam79n72wr55mdqx0jrdj4fj0v";
-  };
-    
 in
 
 stdenv.mkDerivation {
-  name = "mesa-7.0.2";
+  name = "mesa-7.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaLib-7.0.2.tar.bz2;
-    md5 = "93e6ed7924ff069a4f883b4fce5349dc";
+    url = mirror://sourceforge/mesa3d/MesaLib-7.2.tar.bz2;
+    md5 = "04d379292e023df0b0266825cb0dbde5";
   };
-/*    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaGLUT-6.4.tar.bz2;
-      md5 = "1a8c4d4fc699233f5fdb902b8753099e";
-    })
-    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/MesaDemos-6.4.tar.bz2;
-      md5 = "1a8c4d4fc699233f5fdb902b8753099e";
-    }) */
-  
-  buildFlags = "${target}";
-  
-  preBuild = "
-    makeFlagsArray=(INSTALL_DIR=$out DRI_DRIVER_INSTALL_DIR=$out/lib/modules/dri SHELL=$SHELL)
-    cp ${missingPC} src/glw/glw.pc.in
-  ";
   
   buildInputs = [
-    pkgconfig x11 xlibs.makedepend libdrm xlibs.glproto xlibs.libXmu
-    xlibs.libXi xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
+    pkgconfig expat x11 libdrm xlibs.glproto
+    xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage
   ];
   
   passthru = {inherit libdrm;};
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 0e2fa198a862..a0e05f878e27 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, x11, mesa}:
 
 stdenv.mkDerivation {
-  name = "glxinfo-6.5.2";
+  name = "glxinfo-7.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaDemos-6.5.2.tar.bz2;
-    sha256 = "1shfwy0sy3kdk3nykp1gv6s0lafqgqnadwarw5cbpw7mkfap8kw0";
+    url = mirror://sourceforge/mesa3d/MesaDemos-7.2.tar.bz2;
+    md5 = "22e03dc4038cd63f32c21eb60994892b";
   };
 
   buildInputs = [x11 mesa];