* 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
This commit is contained in:
parent
6e6e5a0dde
commit
340afa4008
@ -1,15 +1,15 @@
|
||||
{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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user