summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-09-12 12:14:25 -0700
committerWilliam A. Kennington III <william@wkennington.com>2014-09-12 12:14:25 -0700
commit57becd586a6d859f8218b21910446c1f855e6e7a (patch)
tree1925c51f531e4694ccb2cbd54c934418f624ea99
parent977004408bf9f9b98fbe5506174fa60feccd23d7 (diff)
parent5c4a3c576c10b732e0b64a0ae370d246790ea34b (diff)
downloadnixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar.gz
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar.bz2
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar.lz
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar.xz
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.tar.zst
nixlib-57becd586a6d859f8218b21910446c1f855e6e7a.zip
Merge pull request #4053 from matejc/fix_vaapivdpau
fix vaapiVdpau build with patch
-rw-r--r--pkgs/development/libraries/vaapi-vdpau/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index 9b28d0016ddb..02a4155947f2 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,5 +1,10 @@
 { stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }:
-
+let
+  libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1";
+                                name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch";
+                                sha256 = "1n2cys59wyv8ylx9i5m3s6856mgx24hzcp45w1ahdfbzdv9wrfbl";
+                              });
+in
 stdenv.mkDerivation rec {
   name = "libva-vdpau-driver-0.7.4";
   
@@ -17,6 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libvdpau mesa libva pkgconfig ];
 
   preConfigure = ''
+    patch -p0 < ${libvdpau08patch}  # use -p0 instead of -p1
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';