public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Revert to a version that works. 

svn path=/nixpkgs/trunk/; revision=9073
This commit is contained in:
Eelco Dolstra 2007-08-08 22:34:50 +00:00
parent 4d54140043
commit 081b456a17
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/video/zapping/0.10.nix Normal file
View File

@ -0,0 +1,38 @@
{ 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, rte ? null }:
assert teletextSupport -> zvbi != null && zvbi.pngSupport
/* !!! && pngSupport && zvbi.libpng == libpng */;
assert jpegSupport -> libjpeg != null;
assert pngSupport -> libpng != null;
assert recordingSupport -> rte != null;
stdenv.mkDerivation {
name = "zapping-0.10cvs6";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.10cvs6.tar.bz2;
md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
};
inherit teletextSupport jpegSupport pngSupport libXext;
buildInputs = [
pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
libglade scrollkeeper esound gettext
(if teletextSupport then zvbi else null)
(if jpegSupport then libjpeg else null)
(if pngSupport then libpng else null)
(if recordingSupport then rte else null)
];
}

6
pkgs/applications/video/zapping/default.nix
View File

@ -17,12 +17,12 @@ assert pngSupport -> libpng != null;
assert recordingSupport -> rte != null;
stdenv.mkDerivation {
name = "zapping-0.10cvs6";
name = "zapping-0.9.6";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.10cvs6.tar.bz2;
md5 = "6aa7614ac3fd5d39c89c2198598ad27b";
url = http://nix.cs.uu.nl/dist/tarballs/zapping-0.9.6.tar.bz2;
md5 = "8306775c6a11de4d72345b5eee970ea6";
};
inherit teletextSupport jpegSupport pngSupport libXext;