Upgrade libdrm and mesa to the latest versions

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

1 files changed, 16 insertions, 13 deletions

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index d37b7dd0b7f..7c0127bf710 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,28 +1,31 @@
-{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
+{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
 
-stdenv.mkDerivation (rec {
-  name = "libdrm-2.4.24";
+stdenv.mkDerivation rec {
+  name = "libdrm-2.4.29";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
+    sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
   };
 
-  buildInputs = [ pkgconfig libpthreadstubs ];
+  buildNativeInputs = [ pkgconfig ];
+  buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
 
-  patches = [ ./libdrm-apple.patch ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
 
-  preConfigure = ''
-    # General case: non intel.
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --disable-intel";
-    fi
-  '' + stdenv.lib.optionalString stdenv.isDarwin
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin
   "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
+  configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "-C";
+
+  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+
   meta = {
     homepage = http://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
   };
-} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
+}