From 340afa400891876433cdb25335df5405b7304f77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 22:12:27 +0000 Subject: [PATCH] * libdrm updated to 2.4.34. Drop the Cairo dependency because it's only used for tests (which we don't run anyway), and it will cause a cyclic dependency problem if we enable OpenGL support in Cairo. svn path=/nixpkgs/branches/x-updates/; revision=34132 --- pkgs/development/libraries/libdrm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7c0127bf710..9a79a6e6ee5 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: +{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.29"; + name = "libdrm-2.4.34"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; + sha256 = "1l7qs2qa0kxpbd28yqc2cjl0v2lgmbmyxb4f5xy7n445gh75fs54"; }; buildNativeInputs = [ pkgconfig ]; - buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; + buildInputs = [ libpthreadstubs libpciaccess udev ]; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; preConfigure = stdenv.lib.optionalString stdenv.isDarwin - "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; + "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C";