diff options
| author | Peter Simons <simons@cryp.to> | 2012-01-14 12:13:53 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-01-14 12:13:53 +0000 |
| commit | 4e5092d0c646ea49a0bccbe921fa72e645be0af4 (patch) | |
| tree | b4079cd49997bb9a038016fa6d8622fb01db1e6e | |
| parent | 729162873e341135aa36dc23dca2c3fdcf4e86b6 (diff) | |
| download | nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar.gz nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar.bz2 nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar.lz nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar.xz nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.tar.zst nixpkgs-4e5092d0c646ea49a0bccbe921fa72e645be0af4.zip | |
Revert "libdrm: updated to version 2.4.29"
This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332. svn path=/nixpkgs/trunk/; revision=31537
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdrm/libdrm-apple.patch | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7c0127bf710..d37b7dd0b7f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,31 +1,28 @@ -{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: +{stdenv, fetchurl, pkgconfig, libpthreadstubs}: -stdenv.mkDerivation rec { - name = "libdrm-2.4.29"; +stdenv.mkDerivation (rec { + name = "libdrm-2.4.24"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; + sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7"; }; - buildNativeInputs = [ pkgconfig ]; - buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; + buildInputs = [ pkgconfig libpthreadstubs ]; - patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; + patches = [ ./libdrm-apple.patch ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin + preConfigure = '' + # General case: non intel. + if test -n "$crossConfig"; then + configureFlags="$configureFlags --disable-intel"; + fi + '' + 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" ]; })) diff --git a/pkgs/development/libraries/libdrm/libdrm-apple.patch b/pkgs/development/libraries/libdrm/libdrm-apple.patch index 17b447789c2..e9fd63c5fae 100644 --- a/pkgs/development/libraries/libdrm/libdrm-apple.patch +++ b/pkgs/development/libraries/libdrm/libdrm-apple.patch @@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel --- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400 +++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400 @@ -51,6 +51,7 @@ + #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> - #include <stdbool.h> +#include <sys/time.h> #include "errno.h" |