public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* libdrm updated to 2.4.34. Drop the Cairo dependency because it's

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2012-05-15 22:12:27 +00:00
parent 6e6e5a0dde
commit 340afa4008
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,20 +1,20 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdrm-2.4.29"; name = "libdrm-2.4.34";
src = fetchurl { src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; sha256 = "1l7qs2qa0kxpbd28yqc2cjl0v2lgmbmyxb4f5xy7n445gh75fs54";
}; };
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; buildInputs = [ libpthreadstubs libpciaccess udev ];
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
preConfigure = stdenv.lib.optionalString stdenv.isDarwin 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" ] configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
++ stdenv.lib.optional stdenv.isDarwin "-C"; ++ stdenv.lib.optional stdenv.isDarwin "-C";