about summary refs log tree commit diff
path: root/pkgs/development/libraries/xine-lib/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-07-25 15:08:16 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-07-25 15:08:16 +0000
commita6562218732ba5de420ef5cd3ac6aca4695460df (patch)
tree504703076627046d4328c5df3407008c9e4bc212 /pkgs/development/libraries/xine-lib/default.nix
parentfca12d0cf674e0d10f29a8de423b68058270cad8 (diff)
downloadnixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar.gz
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar.bz2
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar.lz
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar.xz
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.tar.zst
nixlib-a6562218732ba5de420ef5cd3ac6aca4695460df.zip
* xine-lib: get it to build with the latest ffmpeg.
svn path=/nixpkgs/branches/kde-4.7/; revision=27946
Diffstat (limited to 'pkgs/development/libraries/xine-lib/default.nix')
-rw-r--r--pkgs/development/libraries/xine-lib/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 49d68f152678..130af1b95a17 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/xine/${name}.tar.bz2";
     sha256 = "0x47kmsaxx1bv8w2cacvzls3sjw9y4vk82rd94km1m1s6k2wcxv2";
   };
+
+  patches =
+    [ (fetchurl {
+        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
+        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
+      })
+    ];
   
   buildNativeInputs = [ pkgconfig perl ];
 
@@ -23,6 +30,8 @@ stdenv.mkDerivation rec {
   
   propagatedBuildInputs = [zlib];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.xine-project.org/;
     description = "A high-performance, portable and reusable multimedia playback engine";