* Upgraded some xlibs.

* Upgraded zapping (probably doesn't build yet).

svn path=/nixpkgs/trunk/; revision=1069

2 files changed, 13 insertions, 10 deletions

diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh
index 3114f86eda34..6b4790788d39 100644
--- a/pkgs/applications/video/zapping/builder.sh
+++ b/pkgs/applications/video/zapping/builder.sh
@@ -1,5 +1,7 @@
 . $stdenv/setup
 
+export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
+
 # !!! hack
 NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
 
diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix
index 6172d31d1790..ac2ffe08ffb3 100644
--- a/pkgs/applications/video/zapping/default.nix
+++ b/pkgs/applications/video/zapping/default.nix
@@ -2,13 +2,14 @@
 , jpegSupport ? true
 , pngSupport ? true
 # !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
-, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXext, libgnomeui
-, libglade, scrollkeeper, esound, gettext
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui
+, libglade, scrollkeeper, esound, gettext, perlXMLParser
 , zvbi ? null, libjpeg ? null, libpng ? null }:
 
-assert pkgconfig != null && perl != null && python != null &&
-  x11 != null && libXv != null && libgnomeui != null && libglade != null &&
-  scrollkeeper != null && esound != null && gettext != 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 */;
@@ -17,18 +18,18 @@ assert jpegSupport -> libjpeg != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "zapping-0.7cvs6";
+  name = "zapping-0.7cvs8";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
-    md5 = "cdedc0088c70f4520c37066ec05cb996";
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs8.tar.bz2;
+    md5 = "90324a26025a49916c3c6ae5f1738dfa";
   };
 
-  inherit teletextSupport jpegSupport pngSupport libXext;
+  inherit teletextSupport jpegSupport pngSupport perlXMLParser;
 
   buildInputs = [
-    pkgconfig perl python x11 libXv libgnomeui
+    pkgconfig perl python x11 libXv libXmu libgnomeui
     libglade scrollkeeper esound gettext
     (if teletextSupport then zvbi else null)
     (if jpegSupport then libjpeg else null)