From 2c72c03de589720dd75f996f24f5d22740463bda Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Feb 2011 14:48:30 +0000
Subject: [PATCH] * Mesa 7.9.1.

svn path=/nixpkgs/branches/x-updates/; revision=25905
---
 pkgs/development/libraries/mesa/7.9.nix       | 36 -------------------
 pkgs/development/libraries/mesa/default.nix   | 18 +++++-----
 pkgs/development/libraries/talloc/default.nix |  5 ++-
 pkgs/top-level/all-packages.nix               |  4 ---
 4 files changed, 12 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/7.9.nix

diff --git a/pkgs/development/libraries/mesa/7.9.nix b/pkgs/development/libraries/mesa/7.9.nix
deleted file mode 100644
index 89652066d17..00000000000
--- a/pkgs/development/libraries/mesa/7.9.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null,
-  talloc, python, libxml2, libxml2Python}:
-
-if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
-  throw "unsupported platform for Mesa"
-else
-
-stdenv.mkDerivation rec {
-  version = "7.9";
-  name = "mesa-${version}";
-
-  src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1wr927mdghn7w1cmp0bxswjda5s2x0hwfpf8zcc9x03da7s6gkg0";
-  };
-
-  configureFlags =
-    "--disable-gallium"
-    + (if stdenv.system == "mips64-linux" then
-      " --with-dri-drivers=swrast --with-driver=dri" else "")
-    + (if stdenv.isDarwin then " --disable-egl" else "");
-
-  buildInputs =
-    [ pkgconfig expat x11 libdrm xlibs.glproto
-      xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo talloc python libxml2 libxml2Python
-    ];
-
-  passthru = { inherit libdrm; };
-
-  meta = {
-    description = "An open source implementation of OpenGL";
-    homepage = http://www.mesa3d.org/;
-    license = "bsd";
-  };
-}
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9b449be1335..4b56d410203 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }:
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
+let version = "7.9.1"; in
+
 stdenv.mkDerivation {
-  name = "mesa-7.8.2";
+  name = "mesa-${version}";
 
   src = fetchurl {
-    url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2;
-    md5 = "6be2d343a0089bfd395ce02aaf8adb57";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
+    md5 = "07dc6cfb5928840b8b9df5bd1b3ae434";
   };
 
   configureFlags =
     "--disable-gallium"
-    + (if stdenv.system == "mips64-linux" then
-      " --with-dri-drivers=swrast --with-driver=dri" else "")
-    + (if stdenv.isDarwin then " --disable-egl" else "");
+    + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
+      " --with-dri-drivers=swrast --with-driver=dri"
+    + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl";
 
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.glproto
       xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
-      lipo
+      lipo talloc
     ];
 
   passthru = { inherit libdrm; };
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 97f1b7cc26e..f8fe2330cf9 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv}:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "talloc-2.0.1";
@@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = "--enable-talloc-compat1 --enable-largefile";
+  
   meta = {
     description = "talloc is a hierarchical pool based memory allocator with destructors";
-
     homepage = http://tdb.samba.org/;
     license = "GPLv3";
-
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c74cfa8ac81..2e50a041334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3773,10 +3773,6 @@ let
   mesa = callPackage ../development/libraries/mesa {
     lipo = if stdenv.isDarwin then darwinLipoUtility else null;
   };
-  mesa_7_9 = callPackage ../development/libraries/mesa/7.9.nix {
-    lipo = if stdenv.isDarwin then darwinLipoUtility else null;
-  };
-
 
   metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
     sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };