mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

* Update Zapping to 0.9.6.

Browse source 
svn path=/nixpkgs/trunk/; revision=3991
This commit is contained in:
Eelco Dolstra 2005-10-02 15:48:06 +00:00
parent 33ddaafc57
commit 38c5663acb
4 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/video/zapping/default.nix
View file

@ -3,15 +3,11 @@
, 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
, stdenv, fetchurl, pkgconfig, perl, python, x11
, libXv, libXmu, libXext, libgnomeui
, libglade, scrollkeeper, esound, gettext, perlXMLParser
, 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
&& scrollkeeper != null && esound != null && gettext != null
&& perlXMLParser != null;
assert teletextSupport -> zvbi != null && zvbi.pngSupport
/* !!! && pngSupport && zvbi.libpng == libpng */;
@ -21,12 +17,12 @@ assert pngSupport -> libpng != null;
assert recordingSupport -> rte != null;
stdenv.mkDerivation {
name = "zapping-0.7";
name = "zapping-0.9.6";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.7.tar.bz2;
md5 = "dd7b3d920509709692c41c9c6c767746";
url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
md5 = "8306775c6a11de4d72345b5eee970ea6";
};
inherit teletextSupport jpegSupport pngSupport libXext;

9
pkgs/development/libraries/rte/builder.sh
View file

@ -1,9 +0,0 @@
. $stdenv/setup
configureScript=configure
configure() {
# !!! hack: configure returns non-zero even on success.
./configure $configureFlags || true
}
genericBuild

7
pkgs/development/libraries/rte/default.nix
View file

@ -1,10 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "rte-0.5.2";
builder = ./builder.sh;
name = "rte-0.5.6";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/rte-0.5.2.tar.bz2;
md5 = "152d5d81169f0c9a543078543e354ebe";
url = http://heanet.dl.sourceforge.net/sourceforge/zapping/rte-0.5.6.tar.bz2;
md5 = "6259cdff255af71c23a4576e7c5664a0";
};
}

6
pkgs/development/libraries/zvbi/default.nix
View file

@ -5,10 +5,10 @@ assert x11 != null;
assert pngSupport -> libpng != null;
stdenv.mkDerivation {
name = "zvbi-0.2.8";
name = "zvbi-0.2.16";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/zvbi-0.2.8.tar.bz2;
md5 = "8701d3e4387cd896ff8b68831b57d814";
url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.16.tar.bz2;
md5 = "6ed822ae5d0766129bfa1508394b6ac0";
};
buildInputs = [x11 (if pngSupport then libpng else null)];
inherit pngSupport;