diff --git a/pkgs/BUGS b/pkgs/BUGS index 48eb204703c..162d9c18e58 100644 --- a/pkgs/BUGS +++ b/pkgs/BUGS @@ -63,3 +63,7 @@ stdenv.mkDerivation { /* buildInputs = [pkgconfig]; propagatedBuildInputs = [libX11]; */ } + + + +* Add "exit 0" at the end of configure of rte package. diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix index 1ac1d43bd45..19e98c83576 100644 --- a/pkgs/applications/video/zapping/default.nix +++ b/pkgs/applications/video/zapping/default.nix @@ -1,10 +1,11 @@ { teletextSupport ? true , jpegSupport ? true , pngSupport ? true +, recordingSupport ? true # !!! libXext shouldn't be necessary (it's in x11); but the builder needs it. , stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui , libglade, scrollkeeper, esound, gettext, perlXMLParser -, zvbi ? null, libjpeg ? null, libpng ? null }: +, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }: assert pkgconfig != null && perl != null && python != null && x11 != null && libXv != null && libXmu != null && libgnomeui != null && libglade != null @@ -17,6 +18,8 @@ assert teletextSupport -> zvbi != null && zvbi.pngSupport assert jpegSupport -> libjpeg != null; assert pngSupport -> libpng != null; +assert recordingSupport -> rte != null; + stdenv.mkDerivation { name = "zapping-0.7cvs8"; @@ -34,5 +37,6 @@ stdenv.mkDerivation { (if teletextSupport then zvbi else null) (if jpegSupport then libjpeg else null) (if pngSupport then libpng else null) + (if recordingSupport then rte else null) ]; } diff --git a/pkgs/development/libraries/rte/builder.sh b/pkgs/development/libraries/rte/builder.sh new file mode 100644 index 00000000000..98803b79a1c --- /dev/null +++ b/pkgs/development/libraries/rte/builder.sh @@ -0,0 +1,9 @@ +. $stdenv/setup + +configureScript=configure +configure() { + # !!! hack: configure returns non-zero even on success. + ./configure $configureFlags || true +} + +genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/rte/default.nix b/pkgs/development/libraries/rte/default.nix new file mode 100644 index 00000000000..de51b874ff1 --- /dev/null +++ b/pkgs/development/libraries/rte/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "rte-0.5.2"; + builder = ./builder.sh; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/zapping/rte-0.5.2.tar.bz2; + md5 = "152d5d81169f0c9a543078543e354ebe"; + }; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 9b86c179a69..2ef5c756aca 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -433,6 +433,10 @@ rec { libpng = libpng; }; + rte = (import ../development/libraries/rte) { + inherit fetchurl stdenv; + }; + ncurses = (import ../development/libraries/ncurses) { inherit fetchurl stdenv; }; @@ -581,12 +585,13 @@ rec { zapping = (import ../applications/video/zapping) { inherit fetchurl stdenv pkgconfig perl python scrollkeeper gettext zvbi libjpeg libpng x11 - perlXMLParser; + rte perlXMLParser; inherit (gnome) libgnomeui libglade esound; inherit (xlibs) libXv libXmu libXext; teletextSupport = true; jpegSupport = true; pngSupport = true; + recordingSupport = true; }; gqview = (import ../applications/graphics/gqview) { diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index d8a53728d48..9f948f29f80 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -48,7 +48,7 @@ let { pkgs.MPlayer pkgs.MPlayerPlugin pkgs.vlc -# pkgs.zapping + pkgs.zapping pkgs.gqview pkgs.hello pkgs.xchm