diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index cbdc1a2dcf0b..97fb83e4e2a1 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, xorg, alsaLib, libGLU, libGL, aalib +{ lib, stdenv, fetchurl, pkg-config, xorg, alsaLib, libGLU, libGL, aalib , libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager -, libmpcdec +, libmpcdec, ncurses }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.9"; + pname = "xine-lib"; + version = "1.2.11"; src = fetchurl { - url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj"; + url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz"; + sha256 = "01bhq27g5zbgy6y36hl7lajz1nngf68vs4fplxgh98fx20fv4lgg"; }; nativeBuildInputs = [ pkg-config perl ]; @@ -17,15 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac - libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec - ]; - - patches = [ - (fetchpatch { - name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch"; - url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/"; - sha256 = "0nrsdn7myvjs8fl9rj6k4g1bnv0a84prsscg1q9n49gwn339v5rc"; - }) + libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ncurses ]; NIX_LDFLAGS = "-lxcb-shm"; @@ -35,9 +28,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.xine-project.org/"; + homepage = "http://xine.sourceforge.net/home"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; }; }