From b1d7eea5b194866da151d582f612618e04268d50 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 22 Jan 2008 13:09:19 +0000
Subject: [PATCH] xine should work now

svn path=/nixpkgs/branches/stdenv-updates/; revision=10240
---
 pkgs/applications/video/xine-ui/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix             | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index ff0aa091400e..52a4a7736079 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,5 +1,4 @@
-{stdenv, fetchurl, pkgconfig, x11, xineLib, libpng}:
-
+args: with args;
 stdenv.mkDerivation {
   name = "xine-ui-0.99.5";
   src = fetchurl {
@@ -7,10 +6,12 @@ stdenv.mkDerivation {
     sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
   };
   buildInputs = [
-    pkgconfig x11 xineLib libpng
+    pkgconfig x11 xineLib libpng libXext libXv readline ncurses libXxf86vm
+	libXtst inputproto curl
     (if xineLib.xineramaSupport then xineLib.libXinerama else null)
   ];
-  configureFlags = "--without-readline --disable-xft";
+  configureFlags = "--with-readline=${readline}";
+  NIX_LDFLAGS="-L${libXext}/lib -lXext";
 
   meta = {
     description = "Xlib-based interface to Xine, a video player";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9940b6b000c..735d216f00c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4541,7 +4541,8 @@ rec {
   };
 
   xineUI = import ../applications/video/xine-ui {
-    inherit fetchurl stdenv pkgconfig x11 xineLib libpng;
+	inherit fetchurl stdenv pkgconfig x11 xineLib libpng readline ncurses curl;
+	inherit (xorg) libXext libXv libXxf86vm libXtst inputproto;
   };
 
   xmms = import ../applications/audio/xmms {