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 {