* Some applications (notably, everything based on wxGTK) don't work

yet with GTK 2.4.  Fortunately, having several GTKs in parallel is
  no problem for Nix.

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

pkgs/development/libraries/gtk-libs-2.2/atk/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, glib, perl}:
+
+assert pkgconfig != null && glib != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "atk-1.2.4";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
+    md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
+  };
+  buildInputs = [pkgconfig perl];
+  propagatedBuildInputs = [glib];
+}

pkgs/development/libraries/gtk-libs-2.2/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl, x11
+, libtiff, libjpeg, libpng}:
+
+rec {
+
+  glib = (import ./glib) {
+    inherit fetchurl stdenv pkgconfig gettext perl;
+  };
+
+  atk = (import ./atk) {
+    inherit fetchurl stdenv pkgconfig glib perl;
+  };
+
+  pango = (import ./pango) {
+    inherit fetchurl stdenv pkgconfig glib x11;
+  };
+
+  gtk = (import ./gtk+) {
+    inherit fetchurl stdenv pkgconfig glib atk pango perl
+            libtiff libjpeg libpng x11;
+  };
+
+}

pkgs/development/libraries/gtk-libs-2.2/glib/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, gettext, perl}:
+
+assert pkgconfig != null && gettext != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "glib-2.2.3";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
+    md5 = "aa214a10d873b68ddd67cd9de2ccae55";
+  };
+  buildInputs = [pkgconfig gettext perl];
+}

pkgs/development/libraries/gtk-libs-2.2/gtk+/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, x11, glib, atk
+, pango, perl, libtiff, libjpeg, libpng}:
+
+assert pkgconfig != null && x11 != null && glib != null && atk != null
+  && pango != null && perl != null && perl != null && libtiff != null
+  && libjpeg != null && libpng != null;
+assert x11.buildClientLibs;
+#assert glib == atk.glib;
+#assert glib == pango.glib;
+#assert x11 == pango.x11;
+
+stdenv.mkDerivation {
+  name = "gtk+-2.2.4";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
+    md5 = "605332199533e73bc6eec481fb4f1671";
+  };
+  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
+  propagatedBuildInputs = [x11 glib atk pango];
+  inherit libtiff libjpeg libpng;
+}

pkgs/development/libraries/gtk-libs-2.2/pango/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, x11, glib}:
+
+assert pkgconfig != null && x11 != null && glib != null;
+assert x11.buildClientLibs;
+
+stdenv.mkDerivation {
+  name = "pango-1.2.5";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
+    md5 = "df00fe3e71cd297010f24f439b6c8ee6";
+  };
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [x11 glib];
+}

pkgs/system/all-packages-generic.nix

@@ -388,6 +388,11 @@ rec {
             libtiff libjpeg libpng;
   };
 
+  gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng;
+  };
+
   gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
@@ -399,12 +404,12 @@ rec {
   gnome = import ../development/libraries/gnome {
     inherit fetchurl stdenv pkgconfig audiofile
             flex bison popt perl zlib libxml2 bzip2;
-    gtkLibs = gtkLibs;
+    gtkLibs = gtkLibs22;
   };
 
   wxGTK = (import ../development/libraries/wxGTK) {
     inherit fetchurl stdenv pkgconfig;
-    inherit (gtkLibs) gtk;
+    inherit (gtkLibs22) gtk;
   };
 
   gnet = (import ../development/libraries/gnet) {

pkgs/system/populate-cache.nix

@@ -17,7 +17,7 @@ let {
       pkgs.wget
       pkgs.par2cmdline
       pkgs.cksfv
-#      pkgs.bittorrent
+      pkgs.bittorrent
       pkgs.graphviz
       pkgs.bash
       pkgs.binutils
@@ -44,8 +44,8 @@ let {
       pkgs.firefox
       pkgs.MPlayer
       pkgs.MPlayerPlugin
-#      pkgs.vlc
-#      pkgs.zapping
+      pkgs.vlc
+      pkgs.zapping
       pkgs.gqview
       pkgs.hello
       pkgs.nxml