From 081b456a174621227f743701a3ab2994375f9908 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Aug 2007 22:34:50 +0000
Subject: [PATCH] * Revert to a version that works.

svn path=/nixpkgs/trunk/; revision=9073
---
 pkgs/applications/video/zapping/0.10.nix    | 38 +++++++++++++++++++++
 pkgs/applications/video/zapping/default.nix |  6 ++--
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/video/zapping/0.10.nix

diff --git a/pkgs/applications/video/zapping/0.10.nix b/pkgs/applications/video/zapping/0.10.nix
new file mode 100644
index 000000000000..69c4ce51e469
--- /dev/null
+++ b/pkgs/applications/video/zapping/0.10.nix
@@ -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)
+  ];
+}
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 69c4ce51e469..6eae79ddbe12 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -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;