diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 10:25:56 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-09 10:25:56 +0000 |
| commit | f4a079a76c36459b62dea0da7daaa7ad55050345 (patch) | |
| tree | 35ab89ced60abc3eeb48d04edf9bf181e35ac18b /pkgs/applications | |
| parent | ff5134f8b0f64689eb7f82402405aaefa0b7eed8 (diff) | |
| download | nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar.gz nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar.bz2 nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar.lz nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar.xz nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.tar.zst nixlib-f4a079a76c36459b62dea0da7daaa7ad55050345.zip | |
Upgrade xine-lib and xine-ui
svn path=/nixpkgs/trunk/; revision=31451
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 4607c85b6a16..092f5270b783 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,26 +1,29 @@ -{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}: +{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl +, lirc, xz, shared_mime_info }: -stdenv.mkDerivation { - name = "xine-ui-0.99.5"; +stdenv.mkDerivation rec { + name = "xine-ui-0.99.6"; src = fetchurl { - url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz; - sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k"; + url = "mirror://sourceforge/xine/${name}.tar.xz"; + sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf"; }; + buildNativeInputs = [ xz pkgconfig shared_mime_info ]; + buildInputs = - [ pkgconfig xineLib libpng readline ncurses curl + [ xineLib libpng readline ncurses curl lirc xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto - xlibs.libXinerama xlibs.libXi + xlibs.libXinerama xlibs.libXi xlibs.libXft ]; - preBuild = '' - sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h - ''; + patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; configureFlags = "--with-readline=${readline}"; - NIX_LDFLAGS = "-lXext -lgcc_s"; + LIRC_CFLAGS="-I${lirc}/include"; + LIRC_LIBS="-L ${lirc}/lib -llirc_client"; +#NIX_LDFLAGS = "-lXext -lgcc_s"; meta = { homepage = http://www.xine-project.org/; |