xine-ui: xineLib -> xine-lib

And refactor.

+45 -16
+45 -16
pkgs/applications/video/xine-ui/default.nix
··· 1 - {lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl 2 - , lirc, shared-mime-info, libjpeg }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , curl 5 + , libjpeg 6 + , libpng 7 + , lirc 8 + , ncurses 9 + , pkg-config 10 + , readline 11 + , shared-mime-info 12 + , xine-lib 13 + , xorg 14 + }: 3 15 4 16 stdenv.mkDerivation rec { 5 - name = "xine-ui-0.99.12"; 17 + pname = "xine-ui"; 18 + version = "0.99.12"; 6 19 7 20 src = fetchurl { 8 - url = "mirror://sourceforge/xine/${name}.tar.xz"; 21 + url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz"; 9 22 sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; 10 23 }; 11 24 12 - nativeBuildInputs = [ pkg-config shared-mime-info ]; 13 - 14 - buildInputs = 15 - [ xineLib libpng readline ncurses curl lirc libjpeg 16 - xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto 17 - xorg.libXinerama xorg.libXi xorg.libXft 18 - ]; 25 + nativeBuildInputs = [ 26 + pkg-config 27 + shared-mime-info 28 + ]; 29 + buildInputs = [ 30 + curl 31 + libjpeg 32 + libpng 33 + lirc 34 + ncurses 35 + readline 36 + xine-lib 37 + ] ++ (with xorg; [ 38 + libXext 39 + libXft 40 + libXi 41 + libXinerama 42 + libXtst 43 + libXv 44 + libXxf86vm 45 + xlibsWrapper 46 + xorgproto 47 + ]); 19 48 20 - patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; 49 + postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c"; 21 50 22 51 configureFlags = [ "--with-readline=${readline.dev}" ]; 23 52 24 53 LIRC_CFLAGS="-I${lirc}/include"; 25 54 LIRC_LIBS="-L ${lirc}/lib -llirc_client"; 26 - #NIX_LDFLAGS = "-lXext -lgcc_s"; 27 55 28 56 meta = with lib; { 29 - homepage = "http://www.xine-project.org/"; 30 - description = "Xlib-based interface to Xine, a video player"; 57 + homepage = "http://xinehq.de/"; 58 + description = "Xlib-based frontend for Xine video player"; 59 + license = licenses.gpl2Plus; 60 + maintainers = with maintainers; [ AndersonTorres ]; 31 61 platforms = platforms.linux; 32 - license = licenses.gpl2; 33 62 }; 34 63 }