summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2005-10-29 20:50:11 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2005-10-29 20:50:11 +0000
commit34a3dbbb1d7a402323dbdb392df803e5afef9b0c (patch)
tree8e85604282213532ba8613a234922c49814408a2 /pkgs/applications/video
parent0e25817b259575f92ebde98a2b0bf0bffe5ad495 (diff)
downloadnixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar.gz
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar.bz2
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar.lz
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar.xz
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.tar.zst
nixlib-34a3dbbb1d7a402323dbdb392df803e5afef9b0c.zip
* Updated xine-lib and xine-ui.
* xine-ui: compile with Xinerama support if xine-lib was also built
  with it.

svn path=/nixpkgs/trunk/; revision=4165
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/xine-ui/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 3c6d42ffc732..a6ce153b558e 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,11 +1,14 @@
 {stdenv, fetchurl, x11, xineLib, libpng}:
 
 stdenv.mkDerivation {
-  name = "xine-ui-0.99.3";
+  name = "xine-ui-0.99.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz;
-    md5 = "aa7805a93e511e3d67dc1bf09a71fcdd";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.4.tar.gz;
+    md5 = "90ea1f76747e9788a30a73e7f4a76cf6";
   };
-  buildInputs = [x11 xineLib libpng];
+  buildInputs = [
+    x11 xineLib libpng
+    (if xineLib.xineramaSupport then xineLib.libXinerama else null)
+  ];
   configureFlags = "--without-readline";
 }