* Added `zapping', a TV viewer application. It depends on Gnome, so

lots of packages are needed.

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

pkgs/applications/video/zapping/builder.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
+  $libglade $scrollkeeper $esound"
+. $stdenv/setup || exit 1
+
+# !!! hack; this is because $linuxHeaders/config.h includes some
+# file autoconf.h.  What is that?
+export NIX_CFLAGS_COMPILE="-D_LINUX_CONFIG_H $NIX_CFLAGS_COMPILE"
+
+# Bug: esound is not added to LDFLAGS, and libtool then picks it up from /usr!
+
+tar xvfj $src || exit 1
+cd zapping-* || exit 1
+LDFLAGS="-L$esound/lib" ./configure --prefix=$out || exit 1
+make || exit 1
+# !!! hack - it tries to setuid to root
+make install ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g` || exit 1

pkgs/applications/video/zapping/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+, libglade, scrollkeeper, esound }:
+
+assert !isNull pkgconfig && !isNull perl && !isNull python &&
+  !isNull x11 && !isNull libgnomeui && !isNull libglade &&
+  !isNull scrollkeeper && !isNull esound;
+
+# !!! zvbi library
+# !!! arts, jpeg, png, rte
+
+derivation {
+  name = "zapping-0.6.8";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
+    md5 = "cdedc0088c70f4520c37066ec05cb996";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  python = python;
+  x11 = x11;
+  libgnomeui = libgnomeui;
+  libglade = libglade;
+  scrollkeeper = scrollkeeper;
+  esound = esound;
+}

pkgs/development/libraries/audiofile/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs=""
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd audiofile-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/audiofile/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+derivation {
+  name = "audiofile-0.2.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz;
+    md5 = "fd07c62a17ceafa317929e55e51e26c5";
+  };
+  stdenv = stdenv;
+}

pkgs/development/libraries/gnome/GConf/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd GConf-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$ORBit2" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/GConf/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}:
+
+assert !isNull pkgconfig && !isNull perl
+  && !isNull glib && !isNull gtk
+  && !isNull libxml2 && !isNull ORBit && !isNull popt;
+
+derivation {
+  name = "GConf-2.4.0.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/GConf-2.4.0.1.tar.bz2;
+    md5 = "2f7548d0bad24d7c4beba54d0ec98a20";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl; # Perl is not `supposed' to be required, but it is.
+  glib = glib;
+  gtk = gtk;
+  libxml2 = libxml2;
+  ORBit2 = ORBit2;
+  popt = popt;
+}

pkgs/development/libraries/gnome/ORBit2/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $glib $libIDL $popt"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd ORBit2-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$glib" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/ORBit2/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig, glib, libIDL, popt}:
+
+assert !isNull pkgconfig && !isNull glib && !isNull libIDL
+  && !isNull popt;
+
+derivation {
+  name = "ORBit2-2.8.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.8/ORBit2-2.8.3.tar.bz2;
+    md5 = "c6c4b63de2f70310e33a52a37257ddaf";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  glib = glib;
+  libIDL = libIDL;
+  popt = popt;
+}

pkgs/development/libraries/gnome/esound/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$audiofile"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd esound-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$audiofile" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/esound/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, audiofile}:
+
+assert !isNull audiofile;
+
+derivation {
+  name = "esound-0.2.32";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/esound-0.2.32.tar.bz2;
+    md5 = "b2a5e71ec8220fea1c22cc042f5f6e63";
+  };
+  stdenv = stdenv;
+  audiofile = audiofile;
+}

pkgs/development/libraries/gnome/gnome-mime-data/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd gnome-mime-data-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/libraries/gnome/gnome-mime-data/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, perl}:
+
+assert !isNull pkgconfig && !isNull perl;
+
+derivation {
+  name = "gnome-mime-data-2.4.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/gnome-mime-data-2.4.0.tar.bz2;
+    md5 = "b8f1b383a23d734bec8bc33a03cb3690";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+}

pkgs/development/libraries/gnome/gnome-vfs/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $glib $libxml2 $GConf $libbonobo \
+  $gnomemimedata $popt $bzip2"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd gnome-vfs-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/gnome/gnome-vfs/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
+, libbonobo, gnomemimedata, popt, bzip2 }:
+
+assert !isNull pkgconfig && !isNull perl && !isNull glib
+  && !isNull libxml2 && !isNull GConf && !isNull libbonobo
+  && !isNull gnomemimedata && !isNull bzip2;
+
+derivation {
+  name = "gnome-vfs-2.4.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.1.tar.bz2;
+    md5 = "cb7a36076f6a65e40c7f540be3057310";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  glib = glib;
+  libxml2 = libxml2;
+  GConf = GConf;
+  libbonobo = libbonobo;
+  gnomemimedata = gnomemimedata;
+  popt = popt;
+  bzip2 = bzip2;
+}

pkgs/development/libraries/gnome/libart_lgpl/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs=""
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libart_lgpl-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/gnome/libart_lgpl/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+derivation {
+  name = "libart_lgpl-2.3.16";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libart_lgpl-2.3.16.tar.bz2;
+    md5 = "6bb13292b00649d01400a5b29a6c87cb";
+  };
+  stdenv = stdenv;
+}

pkgs/development/libraries/gnome/libbonobo/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $ORBit2 $libxml2 $popt $yacc $flex"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libbonobo-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$ORBit2 $popt" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libbonobo/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, perl, ORBit2, libxml2, popt, yacc, flex}:
+
+assert !isNull pkgconfig && !isNull perl && !isNull ORBit2
+  && !isNull libxml2 && !isNull popt && !isNull yacc && !isNull flex;
+
+derivation {
+  name = "libbonobo-2.4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/libbonobo/2.4/libbonobo-2.4.2.tar.bz2;
+    md5 = "78200cc6ed588c93f0d29177a5f3e003";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  ORBit2 = ORBit2;
+  libxml2 = libxml2;
+  popt = popt;
+  yacc = yacc;
+  flex = flex;
+}

pkgs/development/libraries/gnome/libbonoboui/builder.sh

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $libxml2 $libglade $libgnome \
+  $libgnomecanvas"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libbonoboui-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$libxml2 $libgnome $libgnomecanvas" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libbonoboui/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, perl, libxml2, libglade, libgnome
+, libgnomecanvas}:
+
+assert !isNull pkgconfig && !isNull perl && !isNull libxml2
+  && !isNull libglade && !isNull libgnome && !isNull libgnomecanvas;
+
+derivation {
+  name = "libbonoboui-2.4.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libbonoboui-2.4.1.tar.bz2;
+    md5 = "943a2d0e9fc7b9f0e97ba869de0c5f2a";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  libxml2 = libxml2;
+  libglade = libglade;
+  libgnome = libgnome;
+  libgnomecanvas = libgnomecanvas;
+}

pkgs/development/libraries/gnome/libglade/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $libxml2"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libglade-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$gtk $libxml2" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libglade/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gtk, libxml2}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull libxml2;
+
+derivation {
+  name = "libglade-2.0.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libglade-2.0.1.tar.bz2;
+    md5 = "4d93f6b01510013ae429e91af432cfe2";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  libxml2 = libxml2;
+}

pkgs/development/libraries/gnome/libgnome/builder.sh

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $glib $gnomevfs $libbonobo $GConf \
+  $popt $zlib"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libgnome-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$glib $gnomevfs $libbonobo $GConf" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libgnome/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, perl, glib, gnomevfs, libbonobo
+, GConf, popt, zlib }:
+
+assert !isNull pkgconfig && !isNull perl && !isNull glib
+  && !isNull gnomevfs && !isNull libbonobo && !isNull GConf
+  && !isNull popt && !isNull zlib;
+
+# !!! TO CHECK:
+# libgnome tries to install stuff into GConf (which fails):
+# "WARNING: failed to install schema `/schemas/desktop/gnome/url-handlers/https/need-terminal' locale `is': Failed:
+# Failed to create file `/nix/store/14d4fc76451786eba9dea087d56dc719-GConf-2.4.0/etc/gconf/gconf.xml.defaults/%gconf.xml': Permission denied"
+
+derivation {
+  name = "libgnome-2.0.6";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/libgnome/2.4/libgnome-2.4.0.tar.bz2;
+    md5 = "caec1e12d64b98a2925a4317ac16429f";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  glib = glib;
+  gnomevfs = gnomevfs;
+  libbonobo = libbonobo;
+  GConf = GConf;
+  popt = popt;
+  zlib = zlib;
+}

pkgs/development/libraries/gnome/libgnomecanvas/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $libart $libglade"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libgnomecanvas-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$gtk $libart" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libgnomecanvas/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig, gtk, libart, libglade}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull libart
+  && !isNull libglade;
+
+derivation {
+  name = "libgnomecanvas-2.4.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomecanvas-2.4.0.tar.bz2;
+    md5 = "c212a7cac06b7f9e68ed2de38df6e54d";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  libart = libart;
+  libglade = libglade;
+}

pkgs/development/libraries/gnome/libgnomeui/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $libgnome $libgnomecanvas $libbonoboui $libglade"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libgnomeui-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a $out/lib/libglade/*/*.a || exit 1
+
+echo "$libgnome $libgnomecanvas $libbonoboui" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/gnome/libgnomeui/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, libgnome, libgnomecanvas, libbonoboui, libglade }:
+
+assert !isNull pkgconfig && !isNull libgnome && !isNull libgnomecanvas
+  && !isNull libbonoboui && !isNull libglade;
+
+derivation {
+  name = "libgnomeui-2.4.0.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomeui-2.4.0.1.tar.bz2;
+    md5 = "196f4a3f1f4a531ff57acaa879e98dd2";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  libgnome = libgnome;
+  libgnomecanvas = libgnomecanvas;
+  libbonoboui = libbonoboui;
+  libglade = libglade;
+}

pkgs/development/libraries/popt/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$gettext"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd popt-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/popt/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, gettext}:
+
+assert !isNull gettext;
+
+derivation {
+  name = "popt-1.7";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz;
+    md5 = "5988e7aeb0ae4dac8d83561265984cc9";
+  };
+  stdenv = stdenv;
+  gettext = gettext;
+}

pkgs/development/libraries/scrollkeeper/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+buildinputs="$perl $libxml2 $libxslt"
+. $stdenv/setup || exit 1
+
+export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
+
+tar xvfz $src || exit 1
+cd scrollkeeper-* || exit 1
+./configure --prefix=$out \
+  --with-xml-catalog=$docbook_xml_dtd/xml/dtd/docbook/docbook.cat \
+  || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/scrollkeeper/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd
+, perlXMLParser}:
+
+assert !isNull perl && !isNull libxml2 && !isNull libxslt
+  && !isNull docbook_xml_dtd && !isNull perlXMLParser;
+
+# !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH
+
+derivation {
+  name = "scrollkeeper-0.3.14";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/scrollkeeper/scrollkeeper-0.3.14.tar.gz;
+    md5 = "161eb3f29e30e7b24f84eb93ac696155";
+  };
+  stdenv = stdenv;
+  perl = perl;
+  libxml2 = libxml2;
+  libxslt = libxslt;
+  docbook_xml_dtd = docbook_xml_dtd;
+  perlXMLParser = perlXMLParser;
+}

pkgs/development/perl-modules/XML-Parser/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$perl $expat"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd XML-Parser-* || exit 1
+
+perl Makefile.PL EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include \
+  SITEPREFIX=$out PERLPREFIX=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/perl-modules/XML-Parser/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, perl, expat}:
+
+assert !isNull perl && !isNull expat;
+
+derivation {
+  name = "perl-XML-Parser-2.34";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz;
+    md5 = "84d9e0001fe01c14867256c3fe115899";
+  };
+  stdenv = stdenv;
+  perl = perl;
+  expat = expat;
+}

pkgs/system/all-packages-generic.nix

@@ -347,6 +347,22 @@
     zlib = zlib;
   };
 
+  popt = (import ../development/libraries/popt) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    gettext = gettext; 
+  };
+
+  scrollkeeper = (import ../development/libraries/scrollkeeper) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    perl = perl;
+    libxml2 = libxml2;
+    libxslt = libxslt;
+    docbook_xml_dtd = docbook_xml_dtd;
+    perlXMLParser = perlXMLParser;
+  };
+
   glib = (import ../development/libraries/gtk+/glib) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -407,27 +423,148 @@
     libpng = libpng;
   };
 
-  wxGTK = (import ../development/libraries/wxGTK) {
+  audiofile = (import ../development/libraries/audiofile) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
+  esound = (import ../development/libraries/gnome/esound) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    audiofile = audiofile;
+  };
+
+  libIDL = (import ../development/libraries/gnome/libIDL) {
     fetchurl = fetchurl;
     stdenv = stdenv;
     pkgconfig = pkgconfig;
-    gtk = gtk;
+    glib = glib;
+    lex = flex;
+    yacc = bison;
   };
 
-  gnet = (import ../development/libraries/gnet) {
+  ORBit2 = (import ../development/libraries/gnome/ORBit2) {
     fetchurl = fetchurl;
     stdenv = stdenv;
     pkgconfig = pkgconfig;
     glib = glib;
+    libIDL = libIDL;
+    popt = popt;
   };
 
-  libIDL = (import ../development/libraries/libIDL) {
+  GConf = (import ../development/libraries/gnome/GConf) {
     fetchurl = fetchurl;
     stdenv = stdenv;
     pkgconfig = pkgconfig;
+    perl = perl;
     glib = glib;
-    lex = flex;
+    gtk = gtk;
+    libxml2 = libxml2;
+    ORBit2 = ORBit2;
+    popt = popt;
+  };
+
+  libbonobo = (import ../development/libraries/gnome/libbonobo) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+    ORBit2 = ORBit2;
+    libxml2 = libxml2;
+    popt = popt;
     yacc = bison;
+    flex = flex;
+  };
+
+  gnomemimedata = (import ../development/libraries/gnome/gnome-mime-data) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+  };
+
+  gnomevfs = (import ../development/libraries/gnome/gnome-vfs) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+    glib = glib;
+    libxml2 = libxml2;
+    GConf = GConf;
+    libbonobo = libbonobo;
+    gnomemimedata = gnomemimedata;
+    popt = popt;
+    bzip2 = bzip2; # !!! use stdenv.bzip2
+  };
+
+  libgnome = (import ../development/libraries/gnome/libgnome) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+    glib = glib;
+    gnomevfs = gnomevfs;
+    libbonobo = libbonobo;
+    GConf = GConf;
+    popt = popt;
+    zlib = zlib;
+  };
+
+  libart_lgpl = (import ../development/libraries/gnome/libart_lgpl) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
+  libglade = (import ../development/libraries/gnome/libglade) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    gtk = gtk;
+    libxml2 = libxml2;
+  };
+
+  libgnomecanvas = (import ../development/libraries/gnome/libgnomecanvas) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    gtk = gtk;
+    libart = libart_lgpl;
+    libglade = libglade;
+  };
+
+  libbonoboui = (import ../development/libraries/gnome/libbonoboui) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+    libxml2 = libxml2;
+    libglade = libglade;
+    libgnome = libgnome;
+    libgnomecanvas = libgnomecanvas;
+  };
+
+  libgnomeui = (import ../development/libraries/gnome/libgnomeui) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    libgnome = libgnome;
+    libgnomecanvas = libgnomecanvas;
+    libbonoboui = libbonoboui;
+    libglade = libglade;
+  };
+
+  wxGTK = (import ../development/libraries/wxGTK) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    gtk = gtk;
+  };
+
+  gnet = (import ../development/libraries/gnet) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    glib = glib;
   };
 
   libdvdcss = (import ../development/libraries/libdvdcss) {
@@ -469,6 +606,13 @@
     db4 = db4;
   };
 
+  perlXMLParser = (import ../development/perl-modules/XML-Parser) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    perl = perl;
+    expat = expat;
+  };
+
 
   ### SERVERS
 
@@ -596,6 +740,19 @@
     alsa = alsaLib;
   };
 
+  zapping = (import ../applications/video/zapping) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pkgconfig = pkgconfig;
+    perl = perl;
+    python = python;
+    x11 = xfree86;
+    libgnomeui = libgnomeui;
+    libglade = libglade;
+    scrollkeeper = scrollkeeper;
+    esound = esound;
+  };
+
   gqview = (import ../applications/graphics/gqview) {
     fetchurl = fetchurl;
     stdenv = stdenv;

pkgs/system/populate-cache.nix

@@ -17,6 +17,7 @@ let {
       pkgs.MPlayer
       pkgs.MPlayerPlugin
       pkgs.vlc
+      pkgs.zapping
       pkgs.gqview
       pkgs.hello
       pkgs.nxml