Author: eelco
Date: Tue May 15 22:12:27 2012
New Revision: 34132
URL: https://nixos.org/websvn/nix/?rev=34132&sc=1
Log:
* 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.
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/libdrm/default.nix
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/libdrm/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/development/libraries/libdrm/default.nix
Tue May 15 22:05:13 2012 (r34131)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/libdrm/default.nix
Tue May 15 22:12:27 2012 (r34132)
@@ -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";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
