* Merged the stdenv-updates branch. Enjoy :-)

svn path=/nixpkgs/trunk/; revision=15324
2009-04-26 18:00:49 +00:00 · 2009-04-26 18:00:49 +00:00 · cb6942d923
parent b3d965858b 00d58458c8
commit cb6942d923
438 changed files with 5602 additions and 8608 deletions
--- a/pkgs/applications/audio/bmp-plugins/wma/builder.sh
+++ b/pkgs/applications/audio/bmp-plugins/wma/builder.sh
@ -1,11 +0,0 @@
-source $stdenv/setup
-
-buildFlags="-f Makefile.bmp"
-
-installPhase=installPhase
-installPhase() {
-    ensureDir "$out/lib/bmp/Input"
-    cp libwma.so "$out/lib/bmp/Input"
-}
-
-genericBuild
--- a/pkgs/applications/audio/bmp-plugins/wma/default.nix
+++ b/pkgs/applications/audio/bmp-plugins/wma/default.nix
@ -2,10 +2,18 @@

 stdenv.mkDerivation {
  name = "bmp-plugin-wma-1.0.5";
-  builder = ./builder.sh;
+  
  src = fetchurl {
    url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
    md5 = "5d62a0f969617aeb40096362c7a8a506";
  };
+  
  buildInputs = [pkgconfig bmp];
+
+  buildFlags = "-f Makefile.bmp";
+  
+  installPhase = ''
+    ensureDir "$out/lib/bmp/Input"
+    cp libwma.so "$out/lib/bmp/Input"
+  '';
 }
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [libogg];
+
+  patches = [
+    # Fix for building on GCC 4.3.
+    (fetchurl {
+      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
+      sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
+    })
+  ];
  
  meta = {
    homepage = http://flac.sourceforge.net;
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx
+, libglademm, libcanberra, intltool, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "pavucontrol-0.9.7";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/pavucontrol/${name}.tar.gz";
+    sha256 = "1a1v06hbl1j78ryqy5aiccg6w5hf1yzday2b9h31kx7vr42ir1w0";
+  };
+
+  buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra
+    intltool gettext ];
+
+  configureFlags = "--disable-lynx";
+
+  meta = {
+    description = "PulseAudio Volume Control";
+
+    longDescription = ''
+      PulseAudio Volume Control (pavucontrol) provides a GTK+
+      graphical user interface to connect to a PulseAudio server and
+      easily control the volume of all clients, sinks, etc.
+    '';
+
+    homepage = http://0pointer.de/lennart/projects/pavucontrol/;
+
+    license = "GPLv2+";
+  };
+}
--- a/pkgs/applications/editors/eclipse/eclipse_classic.nix
+++ b/pkgs/applications/editors/eclipse/eclipse_classic.nix
@ -0,0 +1,57 @@
+# Note, if you want to install plugins using the update manager you should
+# copy the store path to a local directory and chown -R $USER yourcopy
+# Then start your local copy
+
+args: with args;
+let arch = if stdenv.system == "x86_64-linux" then "x86_64"
+            else if stdenv.system == "i686-linux" then "x86"
+            else throw "not supported system";
+in
+args.stdenv.mkDerivation rec {
+  #name = "eclipse-classic-3.4M5";
+  name = "eclipse-classic-3.3.1.1";
+
+  unpackPhase = "unzip \$src;     set -x ";
+  buildInputs = [ unzip jdk gtk glib libXtst ant  makeWrapper];
+
+
+  patches=./build_with_jdk_compiler;
+
+  buildPhase = "./build -os linux -ws gtk -arch ${arch}";
+  
+  libraries = [gtk glib libXtst];
+
+  installPhase = "
+    t=\$out/share/${name}
+    ensureDir \$t \$out/bin
+    cd result
+    tar xfz linux-gtk-*.tar.gz
+    mv eclipse \$out
+    "
+    #copied from other eclipse expressions
+    +" rpath=
+    for i in \$libraries; do
+        rpath=\$rpath\${rpath:+:}\$i/lib
+    done
+    find \$out \\( -type f -a -perm +0100 \\) \\
+        -print \\
+        -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\
+        --set-rpath \"\$rpath\" {} \\;
+
+    # Make a wrapper script so that the proper JDK is found.
+    makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\
+        --prefix PATH \":\" \"\$jdk/bin\" \\
+        --prefix LD_LIBRARY_PATH \":\" \"\$rpath\"
+    sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse
+  ";
+  # using dirname so that eclipse still runs after copying the whole store
+  # directory somewhere else (so that you can use the update manager
+
+  src = args.fetchurl {
+    #url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/eclipse-sourceBuild-srcIncluded-3.4M5.zip;
+    #sha256 = "1w6fbpwkys65whygc045556772asggj24x8assnaba6nl70z00az";
+
+    url = http://download.micromata.de/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip;
+    sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4";
+  };
+}
--- a/pkgs/applications/editors/emacs-21/builder.sh
+++ b/pkgs/applications/editors/emacs-21/builder.sh
@ -8,6 +8,5 @@ postConfigure() {
  cp $myglibc/lib/crti.o src
  cp $myglibc/lib/crtn.o src
 }
-postConfigure=postConfigure

 genericBuild
--- a/pkgs/applications/editors/emacs-22/builder.sh
+++ b/pkgs/applications/editors/emacs-22/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-preConfigure=preConfigure
 preConfigure() {
    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
    echo "libc: $libc"
--- a/pkgs/applications/editors/emacs-unicode/builder.sh
+++ b/pkgs/applications/editors/emacs-unicode/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-preConfigure=preConfigure
 preConfigure() {
    libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
    echo "libc: $libc"
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ b/pkgs/applications/editors/monodevelop/builder.sh
@ -3,7 +3,6 @@ source $makeWrapper

 export MONO_GAC_PREFIX=$monodoc:$gtksharp

-postInstall=postInstall
 postInstall() {
    mv $out/bin $out/bin-orig
    mkdir $out/bin
--- a/pkgs/applications/editors/monodoc/builder.sh
+++ b/pkgs/applications/editors/monodoc/builder.sh
@ -1,7 +1,6 @@
 source $stdenv/setup
 source $makeWrapper

-postInstall=postInstall
 postInstall() {
    mv $out/bin $out/bin-orig
    mkdir $out/bin
--- a/pkgs/applications/editors/nedit/builder.sh
+++ b/pkgs/applications/editors/nedit/builder.sh
@ -2,7 +2,6 @@ source $stdenv/setup

 export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"

-installPhase=installPhase
 installPhase() {
    ensureDir $out/bin
    cp -p source/nedit source/nc $out/bin
--- a/pkgs/applications/graphics/f-spot/builder.sh
+++ b/pkgs/applications/graphics/f-spot/builder.sh
@ -1,7 +1,6 @@
 source $stdenv/setup
 source $makeWrapper

-postInstall=postInstall
 postInstall() {
    mv $out/bin $out/bin-orig
    mkdir $out/bin
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
  };

-  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ]; 
+  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ]; 

  propagatedBuildInputs = [
    # Python is used at run-time to execute scripts, e.g., those from
@ -24,6 +24,14 @@ stdenv.mkDerivation rec {

  configureFlags = "--with-python";

+  # Fix compilation on glibc 2.9 by adding missing string header
+  preConfigure = ''
+    echo "#include <string.h>" > tmp.cpp
+    cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new
+    rm tmp.cpp
+    mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp
+  '';
+
  preBuild = ''
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script"
  '';
--- a/pkgs/applications/graphics/inkscape/gtk-clist.patch
+++ b/pkgs/applications/graphics/inkscape/gtk-clist.patch
@ -0,0 +1,11 @@
+--- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:06:52 1.1
+++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h  2008/06/07 22:09:22
+@@ -13,7 +13,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
+ #include "../xml/repr.h"
+ 
+ #include <glib.h>
--- a/pkgs/applications/graphics/xfig/builder.sh
+++ b/pkgs/applications/graphics/xfig/builder.sh
@ -2,7 +2,6 @@ source $stdenv/setup

 makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"

-preBuild=preBuild
 preBuild() {
    echo "#define XAW3D" >> Imakefile.tmp
    echo "#define XAW3D1_5E" >> Imakefile.tmp
--- a/pkgs/applications/misc/cdrtools/builder.sh
+++ b/pkgs/applications/misc/cdrtools/builder.sh
@ -1,11 +0,0 @@
-source $stdenv/setup
-
-prefix=$out
-
-configurePhase() {
- echo ;
-}
-
-configurePhase=configurePhase
-
-genericBuild
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@ -2,7 +2,9 @@

 stdenv.mkDerivation {
  name = "cdrtools-2.01";
-  builder = ./builder.sh;
+  
+  configurePhase = "prefix=$out";  
+  
  #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script
  preInstall = ''
    mkdir "$TMP/bin"
@ -12,10 +14,12 @@ stdenv.mkDerivation {
      PATH="$TMP/bin:$PATH"
    done
  '';
+  
  src = fetchurl {
    url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2;
    md5 = "d44a81460e97ae02931c31188fe8d3fd";
  };
+  
  patches = [./cdrtools-2.01-install.patch];

  meta = {
--- a/pkgs/applications/misc/evince/default.nix
+++ b/pkgs/applications/misc/evince/default.nix
@ -1,26 +1,26 @@
-{ fetchurl, stdenv, perl, perlXMLParser, gettext
+{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
 , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
 , libgnome, libgnomeui, scrollkeeper, libxslt
 , libglade, dbus, dbus_glib
 , poppler, libspectre, djvulibre, shared_mime_info
-, makeWrapper }:
+, makeWrapper, which }:

 stdenv.mkDerivation rec {
-  name = "evince-2.23.4";
+  name = "evince-2.26.0";

  src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.23/${name}.tar.bz2";
-    sha256 = "0svdpx9vkh99vbxsfk5ppi6xl0wqvqsrii7m26irinf0bkfyc964";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/${name}.tar.bz2";
+    sha256 = "1wsl5vdrj0829wq223dryq5p7izgzsz6mfl4igix7b5wga42zff1";
  };

  buildInputs = [
-    perl perlXMLParser gettext
+    perl perlXMLParser gettext intltool
    pkgconfig glib gtk gnomedocutils gnomeicontheme
    libgnome libgnomeui libglade scrollkeeper
    libxslt  # for `xsltproc'
    dbus dbus_glib
    poppler libspectre djvulibre
-    makeWrapper
+    makeWrapper which
  ];

  configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf "
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gphoto2-2.4.2";
+  name = "gphoto2-2.4.5";
  
  src = fetchurl {
    url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0wna84rli816d830hirdv3ficr3q16zs471l725rgsdvc4pqrvy9";
+    sha256 = "0bjbgz9n7ijf8167i1bm7q3pg366axgx5zydck13d2znhd30x069";
  };
  
  buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline libtool];
--- a/pkgs/applications/msic/ttf2pt1/default.nix
+++ b/pkgs/applications/msic/ttf2pt1/default.nix
@ -0,0 +1,28 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "ttf2pt1-3.4.4";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz;
+    sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
+  };
+
+  preConfigure = ''
+    find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@'
+    ensureDir $out
+    sed -e 's/chown/true/' \
+        -e 's/chgrp/true/' \
+        -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \
+        -i scripts/{inst_dir,inst_file} Makefile
+    makeFlags="INSTDIR=$out OWNER=`id -u`"
+  '';
+
+  buildInputs = [freetype];
+  patches = ./gentoo-makefile.patch; # also contains the freetype patch
+
+  meta = { 
+      description = "True Type to Postscript Type 3 converter, fpdf";
+      homepage = "http://ttf2pt1.sourceforge.net/index.html";
+      license = "ttf2pt1";
+  };
+}
--- a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
+++ b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
@ -0,0 +1,98 @@
+diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
+--- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
+++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+@@ -9,7 +9,7 @@
+ #
+ # Use GNU C even if it's not the default compiler
+ #
+-#CC=gcc
+CC=gcc
+ #
+ # Use the standard ANSI C compiler on HP-UX even if it's not default
+ #
+@@ -60,18 +60,18 @@
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment LIBS_FT
+ #
+-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
+CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
+ 
+ # 
+ # The FreeType-2 library flags (disabled by default)
+ 
+-LIBS_FT=
+#LIBS_FT=
+ 
+ # To enable use of the FreeType-2 library
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment CFLAGS_FT
+ #
+-#LIBS_FT= -L/usr/local/lib -lfreetype
+LIBS_FT= -L/usr/lib -lfreetype
+ 
+ #
+ # The flags for C compiler for the Autotrace library (disabled by default). 
+@@ -120,18 +120,18 @@
+ # Installation-related stuff
+ # 
+ # The base dir for installation and subdirs in it
+-INSTDIR = /usr/local
+INSTDIR = /usr
+ # for binaries
+ BINDIR = $(INSTDIR)/bin
+ # for binaries of little general interest
+ LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
+ # for scripts, maps/encodings etc.
+ SHAREDIR = $(INSTDIR)/share/ttf2pt1
+-MANDIR = $(INSTDIR)/man
+MANDIR = $(INSTDIR)/share/man
+ 
+ # owner and group of installed files
+ OWNER = root
+-GROUP = bin
+GROUP = root
+ 
+ # After you have configured the Makefile, comment out the following
+ # definition:
+@@ -244,17 +244,19 @@
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+ 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+-	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+-		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+-		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
+	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
+		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
+		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
+		<scripts/convert >cvt.tmp
+ 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+ 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+ 	rm cvt.tmp
+ 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+ 	for i in $(MANS1); do { \
+-		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+-			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
+		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
+			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
+			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
+			<$$i >$(MANDIR)/man1/$$i \
+ 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
+ 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
+ 		&& chmod 0644 $(MANDIR)/man1/$$i \
+
+
+
+
+
+diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
+--- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
+++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
+#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <freetype/ftglyph.h>
+ #include <freetype/ftsnames.h>
--- a/pkgs/applications/networking/browsers/firefox-2/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox-2/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-postInstall=postInstall
 postInstall() {

    # Strip some more stuff
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@ -29,7 +29,6 @@ stdenv.mkDerivation {

    "--enable-optimize"
    "--disable-debug"
-    "--disable-static"  # needed for `libxul'
    "--enable-strip"
    "--with-system-jpeg"
    "--with-system-zlib"
--- a/pkgs/applications/networking/browsers/mozilla/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-preConfigure=preConfigure
 preConfigure() {
    cat > .mozconfig <<EOF
 #. \$topsrcdir/browser/config/mozconfig
@ -20,7 +19,6 @@ ac_add_options --enable-default-toolkit=gtk2
 EOF
 }

-#postInstall=postInstall
 postInstall() {

    # Strip some more stuff
--- a/pkgs/applications/networking/browsers/opera/builder.sh
+++ b/pkgs/applications/networking/browsers/opera/builder.sh
@ -1,11 +1,9 @@
 source $stdenv/setup

-buildPhase=buildPhase
 buildPhase() {
    true
 }

-installPhase=installPhase
 installPhase() {
  set -x

--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@ -1,13 +1,17 @@
 {stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}:

-stdenv.mkDerivation {
-  name = "irssi-0.8.12";
+stdenv.mkDerivation rec {
+  name = "irssi-0.8.13";
+  
  src = fetchurl {
-    url = http://irssi.org/files/irssi-0.8.12.tar.bz2;
-    sha256 = "1w7zkfs6j7xdcbqh8x0vf9rk2ps9d6rcgr8fapfjpk09nm5n6ba6";
+    url = "http://irssi.org/files/${name}.tar.bz2";
+    sha256 = "0dfp0lmnw5ndl2a9lj2rc8rg1lylcjrqlrg26h4jj8blhfn42rc9";
  };
+  
  buildInputs = [pkgconfig ncurses glib openssl];
+  
  NIX_LDFLAGS = "-lncurses";
+  
  configureFlags = "--with-proxy --with-ncurses --enable-ssl";

  meta = {
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-postInstall=postInstall
 postInstall() {

    # Strip some more stuff
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@ -5,12 +5,10 @@ export NO_HIDS=TRUE

 export PATH=$icu/sbin:$PATH

-postUnpack=postUnpack
 postUnpack() {
  tar xvjf $src_system
 }

-preConfigure=preConfigure
 preConfigure() {
    for i in sysui/desktop/share/makefile.mk; do 
 	substituteInPlace $i --replace /bin/bash $shell
@ -23,8 +21,6 @@ preConfigure() {
    cd config_office/
 }

-
-postConfigure=postConfigure
 postConfigure() {
    cd ..
    for i in LinuxX86*Env.Set; do
@ -35,15 +31,12 @@ postConfigure() {
 	--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
 }

-
-buildPhase=buildPhase
 buildPhase() {
    source LinuxX86*Env.Set.sh
    ./bootstrap
    dmake # wait a few hours...
 }

-
 wrapSOffice() {
    local fn=$1
    local arg=$2
@ -61,8 +54,6 @@ EOF
    chmod +x $out/bin/$fn
 }

-
-installPhase=installPhase
 installPhase() {
    ooFiles=$out/lib/openoffice

@ -85,6 +76,5 @@ installPhase() {
    for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
 }

-
 genericBuild

--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, g77
+{stdenv, fetchurl, lib, gfortran
 , ncurses
 , Xaw3d, withXaw3d ? false
 #, withPVMlib ? false
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    md5 = "17a7a6aa52918f33d96777a0dc423658";
  };

-  buildInputs = [g77 ncurses]
+  buildInputs = [gfortran ncurses]
  ++ lib.optionals withGtk [gtk]
  ++ lib.optionals withOCaml [ocaml]
  ++ lib.optionals withX [x11]
--- a/pkgs/applications/taxes/aangifte-2005/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2005/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-buildPhase=buildPhase
 buildPhase() {
    for i in bin/*; do
        patchelf \
@ -10,10 +9,9 @@ buildPhase() {
    done
 }

-installPhase=installPhase
 installPhase() {
    ensureDir $out
    cp -prvd * $out/
 }

-genericBuild
+genericBuild
--- a/pkgs/applications/taxes/aangifte-2006/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2006/builder.sh
@ -1,6 +1,5 @@
 source $stdenv/setup

-buildPhase=buildPhase
 buildPhase() {
    for i in bin/*; do
        patchelf \
@ -10,10 +9,9 @@ buildPhase() {
    done
 }

-installPhase=installPhase
 installPhase() {
    ensureDir $out
    cp -prvd * $out/
 }

-genericBuild
+genericBuild
--- a/pkgs/applications/taxes/aangifte-2007/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2007/builder.sh
@ -2,7 +2,6 @@ source $stdenv/setup

 echo $NIX_GCC

-buildPhase=buildPhase
 buildPhase() {
    for i in bin/*; do
        patchelf \
@ -12,10 +11,9 @@ buildPhase() {
    done
 }

-installPhase=installPhase
 installPhase() {
    ensureDir $out
    cp -prvd * $out/
 }

-genericBuild
+genericBuild
--- a/pkgs/applications/taxes/aangifte-2008/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2008/builder.sh
@ -2,7 +2,6 @@ source $stdenv/setup

 echo $NIX_GCC

-buildPhase=buildPhase
 buildPhase() {
    for i in bin/*; do
        patchelf \
@ -12,10 +11,9 @@ buildPhase() {
    done
 }

-installPhase=installPhase
 installPhase() {
    ensureDir $out
    cp -prvd * $out/
 }

-genericBuild
+genericBuild
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
   + (if svnSupport then

      ''# wrap git-svn
-        gitperllib=$out/lib/site_perl
+        gitperllib=$out/lib/perl5/site_perl
        for i in ${builtins.toString perlLibs}; do
-          gitperllib=$gitperllib:$i/lib/site_perl
+          gitperllib=$gitperllib:$i/lib/perl5/site_perl
        done
        wrapProgram "$out/libexec/git-core/git-svn"     \
                     --set GITPERLLIB "$gitperllib"     \
--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@ -54,9 +54,9 @@ stdenv.mkDerivation rec {
   + (if svnSupport then

      ''# wrap git-svn
-        gitperllib=$out/lib/site_perl
+        gitperllib=$out/lib/perl5/site_perl
        for i in ${builtins.toString perlLibs}; do
-          gitperllib=$gitperllib:$i/lib/site_perl
+          gitperllib=$gitperllib:$i/lib/perl5/site_perl
        done
 #cp git-svn "$out/bin"
        wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib"
--- a/pkgs/applications/version-management/subversion/1.5.nix
+++ b/pkgs/applications/version-management/subversion/1.5.nix
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {

  configureFlags = ''
    --disable-keychain
-    ${if static then "--disable-shared --enable-all-static" else "--disable-static"}
+    ${if static then "--disable-shared --enable-all-static" else ""}
    ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
    ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
    ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/1.6.nix
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {

  configureFlags = ''
    --disable-keychain
-    ${if static then "--disable-shared --enable-all-static" else "--disable-static"}
+    ${if static then "--disable-shared --enable-all-static" else ""}
    ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
    ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
    ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@ -55,6 +55,7 @@ stdenv.mkDerivation {
    --enable-runtime-cpudetection
    --enable-x11 --with-extraincdir=${libX11}/include
    --disable-xanim
+    --disable-ivtv
  '';

  NIX_LDFLAGS = "-lX11 -lXext";
--- a/pkgs/applications/video/MPlayer/rp9codecs/builder.sh
+++ b/pkgs/applications/video/MPlayer/rp9codecs/builder.sh
@ -1,11 +0,0 @@
-source $stdenv/setup
-
-buildPhase=true
-
-installPhase() {
-    mkdir $out
-    cp -prv * $out
-}
-installPhase=installPhase
-
-genericBuild
--- a/pkgs/applications/video/MPlayer/rp9codecs/default.nix
+++ b/pkgs/applications/video/MPlayer/rp9codecs/default.nix
@ -1,8 +1,15 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
  name = "MPlayer-rp9codecs-20050115";
-  builder = ./builder.sh;
+  
  src = fetchurl {
    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2;
    sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677";
  };
+
+  installPhase = ''
+    mkdir $out
+    cp -prv * $out
+  '';
 }
--- a/pkgs/applications/video/MPlayer/win32codecs/builder.sh
+++ b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
@ -1,11 +0,0 @@
-source $stdenv/setup
-
-buildPhase=true
-
-installPhase() {
-    mkdir $out
-    cp -prv * $out
-}
-installPhase=installPhase
-
-genericBuild
--- a/pkgs/applications/video/MPlayer/win32codecs/default.nix
+++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix
@ -3,13 +3,16 @@
 stdenv.mkDerivation {
  name = "MPlayer-codecs-essential-20071007";
  
-  builder = ./builder.sh;
-  
  src = fetchurl {
    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
    sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
  };

+  installPhase = ''
+    mkdir $out
+    cp -prv * $out
+  '';
+  
  meta = {
    license = "unfree";
  };
--- a/pkgs/applications/video/mythtv/builder.sh
+++ b/pkgs/applications/video/mythtv/builder.sh
@ -15,7 +15,6 @@ buildPhase() {
 }


-postInstall=postInstall
 postInstall() {
    sqlDir="$out/share/mythtv/sql"
    ensureDir $sqlDir
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@ -1,17 +1,21 @@
-args: with args;
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}:
+
 stdenv.mkDerivation {
  name = "xine-ui-0.99.5";
+  
  src = fetchurl {
    url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz;
    sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
  };
-  buildInputs = [
-    pkgconfig x11 xineLib libpng libXext libXv readline ncurses libXxf86vm
-	libXtst inputproto curl
-    (if xineLib.xineramaSupport then xineLib.libXinerama else null)
-  ];
+  
+  buildInputs =
+    [ pkgconfig xineLib libpng readline ncurses curl
+      xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
+    ] ++ stdenv.lib.optional xineLib.xineramaSupport xineLib.libXinerama;
+
  configureFlags = "--with-readline=${readline}";
-  NIX_LDFLAGS="-L${libXext}/lib -lXext";
+  
+  NIX_LDFLAGS = "-lXext -lgcc_s";

  meta = {
    description = "Xlib-based interface to Xine, a video player";
--- a/pkgs/applications/virtualization/virtualbox/2.2.0.nix
+++ b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
@ -0,0 +1,78 @@
+{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python, which}:
+
+let vboxScript = ./VBox.sh;
+in
+stdenv.mkDerivation {
+  name = "virtualbox-2.2.0";
+
+  src = fetchurl {
+    url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2;
+    sha256 = "8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71";
+  };
+
+  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python];
+
+  patchPhase = "
+    set -x
+    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
+    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
+        -i configure
+    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
+    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
+    export USER=nix
+    set +x
+  ";
+
+  configurePhase = ''
+    # It wants the qt utils from qt3, and it takes them from QTDIR
+    export QTDIR=${qt3}
+    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
+    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
+        -i AutoConfig.kmk
+    sed -e 's@arch/x86/@@' \
+        -i Config.kmk
+    cat >> AutoConfig.kmk << END_PATHS
+    VBOX_PATH_APP_PRIVATE := $out
+    VBOX_PATH_APP_DOCS := $out/doc
+    END_PATHS
+  '';
+
+  buildPhase = ''
+    source env.sh
+    kmk
+    cd out/linux.*/release/bin/src
+    export KERN_DIR=${kernel}/lib/modules/*/build
+    make
+    cd ../../../../..
+  '';
+    
+  installPhase = ''
+    cd out/linux.*/release/bin
+    ensureDir $out/virtualbox
+    cp -av * $out/virtualbox
+    cd src
+    kernelVersion=$(cd ${kernel}/lib/modules; ls)
+    export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
+    ensureDir $MODULE_DIR    
+    make install
+    ensureDir $out/bin
+    cp -v ${vboxScript} $out/bin/VBox.sh
+    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
+           -e "s|@QT4_PATH@|${qt4}/lib|" \
+	   -e "s|which|${which}/bin/which|" \
+	   -e "s|gawk|${stdenv.gawk}/bin/gawk|" \
+	   $out/bin/VBox.sh
+    chmod 755 $out/bin/VBox.sh
+    for file in VirtualBox VBoxManage VBoxSDL
+    do
+        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
+    done
+    ensureDir $out/share/applications
+    ln -sfv $out/virtualbox/VirtualBox.desktop $out/share/applications
+  '';
+  
+  meta = {
+    description = "PC emulator";
+    homepage = http://www.virtualbox.org/;
+  };
+}
--- a/pkgs/build-support/gcc-wrapper-new/add-flags
+++ b/pkgs/build-support/gcc-wrapper-new/add-flags
@ -1,24 +0,0 @@
-# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld.
-export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
-
-if test -e @out@/nix-support/libc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/libc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS"
-fi
-
-if test -e @out@/nix-support/gcc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
-fi
-
-if test -e @out@/nix-support/gcc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS"
-fi
-
-if test -e @out@/nix-support/libc-ldflags-before; then
-    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
-fi
-
-export NIX_GCC_WRAPPER_FLAGS_SET=1
--- a/pkgs/build-support/gcc-wrapper-new/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-new/builder.sh
@ -1,139 +0,0 @@
-source $stdenv/setup
-
-
-ensureDir $out/bin
-ensureDir $out/nix-support
-
-
-if test -z "$nativeLibc"; then
-    dynamicLinker="$libc/lib/$dynamicLinker"
-    echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-    if test -e $libc/lib/32/ld-linux.so.2; then
-        echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
-    fi
-
-    # The "-B$libc/lib/" flag is a quick hack to force gcc to link
-    # against the crt1.o from our own glibc, rather than the one in
-    # /usr/lib.  (This is only an issue when using an `impure'
-    # compiler/linker, i.e., one that searches /usr/lib and so on.)
-    echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags
-    
-    echo "-L$libc/lib" > $out/nix-support/libc-ldflags
-
-    # The dynamic linker is passed in `ldflagsBefore' to allow
-    # explicit overrides of the dynamic linker by callers to gcc/ld
-    # (the *last* value counts, so ours should come first).
-    echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before
-fi
-
-if test -n "$nativeTools"; then
-    gccPath="$nativePrefix/bin"
-    ldPath="$nativePrefix/bin"
-else
-    if test -e "$gcc/lib64"; then
-        gccLDFlags="$gccLDFlags -L$gcc/lib64"
-    fi
-    gccLDFlags="$gccLDFlags -L$gcc/lib"
-    echo "$gccLDFlags" > $out/nix-support/gcc-ldflags
-
-    # Explicitly add the libstdc++ header files to the search path.
-    # G++ already finds them automatically, but it adds them to the
-    # very end of the header search path.  This means that
-    # #include_next constructs in the libstdc++ headers won't find the
-    # Glibc headers, since they appear *before* the libstdc++ headers.
-    # So we add them here using -isystem.  Note that `add-flags' adds
-    # the libc flags before the gcc flags.
-    if test -e $gcc/include/c++/*.*; then
-        gccCFlags="$gccCFlags -isystem $(echo $gcc/include/c++/*.*)"
-    fi
-
-    # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
-    # $gcc/lib64 (even though it does actually search there...)..
-    # This confuses libtool.  So add it to the compiler tool search
-    # path explicitly.
-    if test -e "$gcc/lib64"; then
-        gccCFlags="$gccCFlags -B$gcc/lib64"
-    fi
-    echo "$gccCFlags" > $out/nix-support/gcc-cflags
-    
-    gccPath="$gcc/bin"
-    ldPath="$binutils/bin"
-fi
-
-
-doSubstitute() {
-    local src=$1
-    local dst=$2
-    # Can't use substitute() here, because replace may not have been
-    # built yet (in the bootstrap).
-    sed \
-        -e "s^@out@^$out^g" \
-        -e "s^@shell@^$shell^g" \
-        -e "s^@gcc@^$gcc^g" \
-        -e "s^@gccProg@^$gccProg^g" \
-        -e "s^@binutils@^$binutils^g" \
-        -e "s^@libc@^$libc^g" \
-        -e "s^@ld@^$ldPath/ld^g" \
-        < "$src" > "$dst" 
-}
-
-
-# Make wrapper scripts around gcc, g++, and gfortran.  Also make symlinks
-# cc, c++, and f77.
-mkGccWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return
-    fi
-
-    gccProg="$src"
-    doSubstitute "$gccWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-mkGccWrapper $out/bin/gcc $gccPath/gcc
-ln -s gcc $out/bin/cc
-
-mkGccWrapper $out/bin/g++ $gccPath/g++
-ln -s g++ $out/bin/c++
-
-if test -e $gccPath/gfortran; then
-    mkGccWrapper $out/bin/gfortran $gccPath/gfortran
-    ln -s gfortran $out/bin/g77
-    ln -s gfortran $out/bin/f77
-fi
-
-
-# Create a symlink to as (the assembler).  This is useful when a
-# gcc-wrapper is installed in a user environment, as it ensures that
-# the right assembler is called.
-ln -s $ldPath/as $out/bin/as
-
-
-# Make a wrapper around the linker.
-doSubstitute "$ldWrapper" "$out/bin/ld"
-chmod +x "$out/bin/ld"
-
-
-# Emit a setup hook.  Also store the path to the original GCC and
-# Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
-test -n "$libc" && echo $libc > $out/nix-support/orig-libc
-
-doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
-
-doSubstitute "$setupHook" "$out/nix-support/setup-hook"
-
-cp -p $utils $out/nix-support/utils.sh
-
-
-# Propagate the wrapped gcc so that if you install the wrapper, you get
-# tools like gcov, the manpages, etc. as well (including for binutils
-# and Glibc).
-if test -z "$nativeTools"; then
-    echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
-fi
--- a/pkgs/build-support/gcc-wrapper-new/default.nix
+++ b/pkgs/build-support/gcc-wrapper-new/default.nix
@ -1,46 +0,0 @@
-# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
-# know where the C library and standard header files are.  Therefore
-# the compiler produced by that package cannot be installed directly
-# in a user environment and used from the command line.  This
-# stdenv.mkDerivation provides a wrapper that sets up the right environment
-# variables so that the compiler and the linker just "work".
-
-{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
-, gcc ? null, libc ? null, binutils ? null, shell ? ""
-}:
-
-assert nativeTools -> nativePrefix != "";
-assert !nativeTools -> gcc != null && binutils != null;
-assert !nativeLibc -> libc != null;
-
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  gccWrapper = ./gcc-wrapper.sh;
-  ldWrapper = ./ld-wrapper.sh;
-  utils = ./utils.sh;
-  addFlags = ./add-flags;
-  
-  inherit nativeTools nativeLibc nativePrefix gcc;
-  libc = if nativeLibc then null else libc;
-  binutils = if nativeTools then null else binutils;
-  
-  name = if name == "" then gcc.name else name;
-  langC = if nativeTools then true else gcc.langC;
-  langCC = if nativeTools then true else gcc.langCC;
-  langFortran = if nativeTools then false else gcc ? langFortran;
-  shell = if shell == "" then stdenv.shell else shell;
-  
-  meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else
-    { description = "System C compiler wrapper";
-    };
-
-  # The dynamic linker has different names on different Linux platforms.
-  dynamicLinker =
-    if !nativeLibc then
-      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
-       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
-       if stdenv.system == "powerpc-linux" then "ld.so.1" else
-       abort "don't know the name of the dynamic linker for this platform")
-    else "";
-}
--- a/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper-new/gcc-wrapper.sh
@ -1,148 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
-    source "$NIX_GCC_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-getVersion=0
-nonFlagArgs=0
-
-for i in "$@"; do
-    if test "$i" = "-c"; then
-        dontLink=1
-    elif test "$i" = "-S"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-E"; then
-        dontLink=1
-    elif test "$i" = "-M"; then
-        dontLink=1
-    elif test "$i" = "-MM"; then
-        dontLink=1
-    elif test "${i:0:1}" != "-"; then
-        nonFlagArgs=1
-    elif test "$i" = "-m32"; then
-        if test -e @out@/nix-support/dynamic-linker-m32; then
-            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
-        fi
-    fi
-done
-
-# If we pass a flag like -Wl, then gcc will call the linker unless it
-# can figure out that it has to do something else (e.g., because of a
-# "-c" flag).  So if no non-flag arguments are given, don't pass any
-# linker flags.  This catches cases like "gcc" (should just print
-# "gcc: no input files") and "gcc -v" (should print the version).
-if test "$nonFlagArgs" = "0"; then
-    dontLink=1
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-I" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-isystem" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the C compiler proper.
-extraAfter=($NIX_CFLAGS_COMPILE)
-extraBefore=()
-
-if test "$dontLink" != "1"; then
-
-    # Add the flags that should only be passed to the compiler when
-    # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
-
-    # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_LDFLAGS again).
-    for i in $NIX_LDFLAGS_BEFORE; do
-        extraBefore=(${extraBefore[@]} "-Wl,$i")
-    done
-    for i in $NIX_LDFLAGS; do
-	if test "${i:0:3}" = "-L/"; then
-	    extraAfter=(${extraAfter[@]} "$i")
-	else
-	    extraAfter=(${extraAfter[@]} "-Wl,$i")
-	fi
-    done
-    export NIX_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
-fi
-
-# As a very special hack, if the arguments are just `-v', then don't
-# add anything.  This is to prevent `gcc -v' (which normally prints
-# out the version number and returns exit code 0) from printing out
-# `No input files specified' and returning exit code 1.
-if test "$*" = "-v"; then
-    extraAfter=()
-    extraBefore=()
-fi    
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gccProg@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gccProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gccProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_GCC_WRAPPER_EXEC_HOOK"
-fi
-
-
-# Call the real `gcc'.  Filter out warnings from stderr about unused
-# `-B' flags, since they confuse some programs.  Deep bash magic to
-# apply grep to stderr (by swapping stdin/stderr twice).
-if test -z "$NIX_GCC_NEEDS_GREP"; then
-    @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
-else
-    (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
-        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
-    exit $?
-fi    
--- a/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper-new/ld-wrapper.sh
@ -1,145 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    source "$NIX_LD_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
-    source @out@/nix-support/add-flags.sh
-fi
-
-source @out@/nix-support/utils.sh
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
-        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-rpath" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:1}" = "/" && badPath "$p"; then
-            # We cannot skip this; barf.
-            echo "impure path \`$p' used in link" >&2
-            exit 1
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-extra=()
-extraBefore=()
-
-if test -z "$NIX_LDFLAGS_SET"; then
-    extra=(${extra[@]} $NIX_LDFLAGS)
-    extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
-fi
-
-
-# Add all used dynamic libraries to the rpath.
-if test "$NIX_DONT_SET_RPATH" != "1"; then
-
-    # First, find all -L... switches.
-    allParams=("${params[@]}" ${extra[@]})
-    libPath=""
-    addToLibPath() {
-        local path="$1"
-        if test "${path:0:1}" != "/"; then return 0; fi
-        case "$path" in
-            *..*|*./*|*/.*|*//*)
-                local path2
-                if path2=$(readlink -f "$path"); then
-                    path="$path2"
-                fi
-                ;;
-        esac
-        case $libPath in
-            *\ $path\ *) return 0 ;;
-        esac
-        libPath="$libPath $path "
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:3}" = "-L/"; then
-            addToLibPath ${p:2}
-        elif test "$p" = "-L"; then
-            addToLibPath ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Second, for each -l... switch, find the directory containing the
-    # library and add it to the rpath.
-    rpath=""
-    addToRPath() {
-        # If the path is not in the store, don't add it to the rpath.
-        # This typically happens for libraries in /tmp that are later
-        # copied to $out/lib.  If not, we're screwed.
-        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
-        case $rpath in
-            *\ $1\ *) return 0 ;;
-        esac
-        rpath="$rpath $1 "
-    }
-    findLib() {
-        for i in $libPath; do
-            if test -f $i/lib$1.so; then
-                addToRPath $i
-            fi
-        done
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:2}" = "-l"; then
-            findLib ${p:2}
-        elif test "$p" = "-l"; then
-            # I haven't seen `-l foo', but you never know...
-            findLib ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Finally, add `-rpath' switches.
-    for i in $rpath; do
-        extra=(${extra[@]} -rpath $i)
-    done
-fi
-
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @ld@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extra flags to @ld@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_LD_WRAPPER_EXEC_HOOK"
-fi
-
-exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
--- a/pkgs/build-support/gcc-wrapper-new/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper-new/setup-hook.sh
@ -1,29 +0,0 @@
-addCVars () {
-    if test -d $1/include; then
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
-    fi
-
-    if test -d $1/lib64; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
-    fi
-
-    if test -d $1/lib; then
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
-    fi
-}
-
-envHooks=(${envHooks[@]} addCVars)
-
-# Note: these come *after* $out in the PATH (see setup.sh).
-
-if test -n "@gcc@"; then
-    PATH=$PATH:@gcc@/bin
-fi
-
-if test -n "@binutils@"; then
-    PATH=$PATH:@binutils@/bin
-fi
-
-if test -n "@libc@"; then
-    PATH=$PATH:@libc@/bin
-fi
--- a/pkgs/build-support/gcc-wrapper-new/utils.sh
+++ b/pkgs/build-support/gcc-wrapper-new/utils.sh
@ -1,23 +0,0 @@
-skip () {
-    if test "$NIX_DEBUG" = "1"; then
-        echo "skipping impure path $1" >&2
-    fi
-}
-
-
-# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
-# `/nix/store/.../lib/foo.so' isn't.
-badPath() {
-    local p=$1
-    
-    # Relative paths are okay (since they're presumably relative to
-    # the temporary build directory).
-    if test "${p:0:1}" != "/"; then return 1; fi
-    
-    # Otherwise, the path should refer to the store or some temporary
-    # directory (including the build directory).
-    test \
-        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
-        "${p:0:4}" != "/tmp" -a \
-        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
-}
--- a/pkgs/build-support/gcc-wrapper/add-flags
+++ b/pkgs/build-support/gcc-wrapper/add-flags
@ -5,16 +5,16 @@ if test -e @out@/nix-support/libc-cflags; then
    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
 fi

-if test -e @out@/nix-support/libc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS"
-fi
-
 if test -e @out@/nix-support/gcc-cflags; then
    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
 fi

+if test -e @out@/nix-support/libc-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
+fi
+
 if test -e @out@/nix-support/gcc-ldflags; then
-    export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS"
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)"
 fi

 if test -e @out@/nix-support/libc-ldflags-before; then
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@ -9,11 +9,15 @@ if test -z "$nativeLibc"; then
    dynamicLinker="$libc/lib/$dynamicLinker"
    echo $dynamicLinker > $out/nix-support/dynamic-linker

+    if test -e $libc/lib/32/ld-linux.so.2; then
+        echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+    fi
+
    # The "-B$libc/lib/" flag is a quick hack to force gcc to link
    # against the crt1.o from our own glibc, rather than the one in
    # /usr/lib.  (This is only an issue when using an `impure'
    # compiler/linker, i.e., one that searches /usr/lib and so on.)
-    echo "-B$libc/lib/ -isystem $libc/include" > $out/nix-support/libc-cflags
+    echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags
    
    echo "-L$libc/lib" > $out/nix-support/libc-ldflags

@ -64,7 +68,7 @@ doSubstitute() {
 }


-# Make wrapper scripts around gcc, g++, and g77.  Also make symlinks
+# Make wrapper scripts around gcc, g++, and gfortran.  Also make symlinks
 # cc, c++, and f77.
 mkGccWrapper() {
    local dst=$1
@ -86,8 +90,11 @@ ln -s gcc $out/bin/cc
 mkGccWrapper $out/bin/g++ $gccPath/g++
 ln -s g++ $out/bin/c++

-mkGccWrapper $out/bin/g77 $gccPath/g77
-ln -s g77 $out/bin/f77
+if test -e $gccPath/gfortran; then
+    mkGccWrapper $out/bin/gfortran $gccPath/gfortran
+    ln -s gfortran $out/bin/g77
+    ln -s gfortran $out/bin/f77
+fi


 # Create a symlink to as (the assembler).  This is useful when a
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@ -13,7 +13,18 @@ assert nativeTools -> nativePrefix != "";
 assert !nativeTools -> gcc != null && binutils != null;
 assert !nativeLibc -> libc != null;

+let
+
+  gccVersion = (builtins.parseDrvName gcc.name).version;
+  gccName = (builtins.parseDrvName gcc.name).name;
+  
+in
+
 stdenv.mkDerivation {
+  name =
+    (if name != "" then name else gccName + "-wrapper") +
+    (if gcc != null && gccVersion != "" then "-" + gccVersion else "");
+  
  builder = ./builder.sh;
  setupHook = ./setup-hook.sh;
  gccWrapper = ./gcc-wrapper.sh;
@ -25,14 +36,17 @@ stdenv.mkDerivation {
  libc = if nativeLibc then null else libc;
  binutils = if nativeTools then null else binutils;
  
-  name = if name == "" then gcc.name else name;
  langC = if nativeTools then true else gcc.langC;
  langCC = if nativeTools then true else gcc.langCC;
-  langF77 = if nativeTools then false else gcc.langF77;
+  langFortran = if nativeTools then false else gcc ? langFortran;
  shell = if shell == "" then stdenv.shell else shell;
  
-  meta = if gcc != null && (gcc ? meta) then removeAttrs gcc.meta ["priority"] else
-    { description = "System C compiler wrapper";
+  meta =
+    let gcc_ = if gcc != null then gcc else {}; in
+    (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
+    { description =
+        stdenv.lib.getAttr ["meta" "description"] "System C compiler" gcc_
+        + " (wrapper script)";
    };

  # The dynamic linker has different names on different Linux platforms.
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
@ -32,6 +32,10 @@ for i in "$@"; do
        dontLink=1
    elif test "${i:0:1}" != "-"; then
        nonFlagArgs=1
+    elif test "$i" = "-m32"; then
+        if test -e @out@/nix-support/dynamic-linker-m32; then
+            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+        fi
    fi
 done

--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@ -85,9 +85,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
        n=$((n + 1))
    done

-    # Second, for each -l... switch, find the directory containing the
-    # library and add it to the rpath.
+    # Second, for each directory in the library search path (-L...),
+    # see if it contains a dynamic library used by a -l... flag.  If
+    # so, add the directory to the rpath.
    rpath=""
+    
    addToRPath() {
        # If the path is not in the store, don't add it to the rpath.
        # This typically happens for libraries in /tmp that are later
@ -98,26 +100,25 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
        esac
        rpath="$rpath $1 "
    }
-    findLib() {
-        for i in $libPath; do
-            if test -f $i/lib$1.so; then
+
+    for i in $libPath; do
+        n=0
+        while test $n -lt ${#allParams[*]}; do
+            p=${allParams[n]}
+            p2=${allParams[$((n+1))]}
+            if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then
                addToRPath $i
+                break
+            elif test "$p" = "-l" -a -f "$i/lib${p2}"; then
+                # I haven't seen `-l foo', but you never know...
+                addToRPath $i
+                break
            fi
-        done
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:2}" = "-l"; then
-            findLib ${p:2}
-        elif test "$p" = "-l"; then
-            # I haven't seen `-l foo', but you never know...
-            findLib ${p2}
            n=$((n + 1))
-        fi
-        n=$((n + 1))
+        done
+            
    done
+    

    # Finally, add `-rpath' switches.
    for i in $rpath; do
--- a/pkgs/build-support/gcc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh
@ -17,13 +17,13 @@ envHooks=(${envHooks[@]} addCVars)
 # Note: these come *after* $out in the PATH (see setup.sh).

 if test -n "@gcc@"; then
-    PATH=$PATH:@gcc@/bin
+    addToSearchPath PATH @gcc@/bin
 fi

 if test -n "@binutils@"; then
-    PATH=$PATH:@binutils@/bin
+    addToSearchPath PATH @binutils@/bin
 fi

 if test -n "@libc@"; then
-    PATH=$PATH:@libc@/bin
+    addToSearchPath PATH @libc@/bin
 fi
--- a/pkgs/build-support/make-wrapper/make-wrapper.sh
+++ b/pkgs/build-support/make-wrapper/make-wrapper.sh
@ -66,7 +66,9 @@ makeWrapper() {
        fi
    done

-    echo "exec \"$original\" $flagsBefore \"\$@\"" >> $wrapper
+    # Note: extraFlagsArray is an array containing additional flags
+    # that may be set by --run actions.
+    echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
    
    chmod +x $wrapper
 }
@ -90,7 +92,7 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
    local prog="$1"
-    local hidden="$(dirname "$prog")/.wrapped-$(basename "$prog")"
+    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
    mv $prog $hidden
    makeWrapper $hidden $prog "$@"
 }
--- a/pkgs/build-support/nuke-references/builder.sh
+++ b/pkgs/build-support/nuke-references/builder.sh
@ -4,9 +4,11 @@ ensureDir $out/bin
 cat > $out/bin/nuke-refs <<EOF
 #! $SHELL -e
 for i in \$*; do
-    cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
-    if test -x \$i; then chmod +x \$i.tmp; fi
-    mv \$i.tmp \$i
+    if test ! -L \$i -a -f \$i; then
+        cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp
+        if test -x \$i; then chmod +x \$i.tmp; fi
+        mv \$i.tmp \$i
+    fi
 done
 EOF
 chmod +x $out/bin/nuke-refs
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@ -57,7 +57,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
      ensureDir $out/debs
      find . -name "*.deb" -exec cp {} $out/debs \;

-      shopt -s nullglob
      for i in $out/debs/*.deb; do
        header "Generated DEB package: $i"
        dpkg-deb --info "$i"
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@ -5,8 +5,7 @@ with pkgs;
 rec {

  sourceTarball = args: import ./source-tarball.nix (
-    { inherit autoconf automake libtool;
-      stdenv = stdenvNew;
+    { inherit stdenv autoconf automake libtool;
    } // args);

  makeSourceTarball = sourceTarball; # compatibility
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@ -26,7 +26,6 @@ vmTools.buildRPM (
    ''; # */

    postInstall = ''
-      shopt -s nullglob
      for i in $out/rpms/*/*.rpm; do
        echo "file rpm $i" >> $out/nix-support/hydra-build-products
      done
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@ -49,7 +49,6 @@ stdenv.mkDerivation (
    
    postHook = ''
      ensureDir $out/nix-support
-      shopt -s nullglob
    '';  

    postUnpack = ''
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, gettext, intltool, libxml2, glib}:
+{stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
+, libxml2, glib}:

 stdenv.mkDerivation rec {
  name = "shared-mime-info-0.51";
@ -8,7 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w";
  };

-  buildInputs = [pkgconfig gettext intltool libxml2 glib];
+  buildInputs = [
+    pkgconfig gettext intltool perl perlXMLParser libxml2 glib
+  ];

  meta = {
    description = "A database of common MIME types";
--- a/pkgs/data/misc/xkeyboard-config/0.9.nix
+++ b/pkgs/data/misc/xkeyboard-config/0.9.nix
@ -1,23 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
-
-  src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
-  };
-
-  buildInputs = [perl perlXMLParser xkbcomp];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
-  '';
-}
--- a/pkgs/data/misc/xkeyboard-config/1.2.nix
+++ b/pkgs/data/misc/xkeyboard-config/1.2.nix
@ -1,25 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-${version}";
-
-  src = fetchurl {
-          url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
-          sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
-        };
-  buildInputs = [perl perlXMLParser xkbcomp gettext];
-
-  ICONV = "iconv";
-
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
-
-  patches = [ ./eo.patch ];
-
-  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled || true;
-	cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
-	sed -e '/xkb_symbols "polytonic"/,/^partial /d' -i $out/etc/X11/xkb/symbols/gr
-  '';
-}
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@ -1,23 +1,22 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp}:
+{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:

 stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
+  name = "xkeyboard-config-1.4";

  src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
+    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2;
+    sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj";
  };

-  buildInputs = [perl perlXMLParser xkbcomp];
+  buildInputs = [perl perlXMLParser xkbcomp gettext intltool];

  ICONV = "iconv";

-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
+  preConfigure = ''
+    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
+  '';

  postInstall = ''
-  	rm ''${out}/etc/X11/xkb/compiled
-	cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
+    cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
  '';
 }
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@ -8,7 +8,7 @@ rec {

  # Platform

-  platform = import ./src-gnome-platform-2.22.1.nix {
+  platform = import ./src-gnome-platform-2.26.0.nix {
    inherit fetchurl;
  };

@ -43,7 +43,11 @@ rec {

  GConf = stdenv.mkDerivation {
    inherit (platform.GConf) name src;
-    buildInputs = [pkgconfig perl glib gtk libxml2 popt gettext perlXMLParser];
+    buildInputs = [
+      pkgconfig perl glib gtk libxml2
+      dbus dbus_glib
+      popt gettext perlXMLParser intltool
+    ];
    propagatedBuildInputs = [ORBit2];
  };

@ -56,7 +60,7 @@ rec {
    inherit (platform.gnomevfs) name src;
    buildInputs = [
      pkgconfig perl glib libxml2 libbonobo
-      gnomemimedata popt perlXMLParser gettext bzip2
+      gnomemimedata popt perlXMLParser gettext intltool bzip2
      dbus_glib hal openssl samba fam
    ];
    propagatedBuildInputs = [GConf];
@ -64,13 +68,17 @@ rec {
  };

  gail = stdenv.mkDerivation {
-    inherit (platform.gail) name src;
+    name = "gail-1.22.3";
+    src = fetchurl {
+      url = "http://ftp.gnome.org/pub/GNOME/sources/gail/1.22/gail-1.22.3.tar.bz2";
+      sha256 = "1s4s0ndjh42i8x2mchz0xm3qcp942vkmz0jsq7ig1d3y4wlk1w03";
+    };
    buildInputs = [pkgconfig atk gtk];
  };

  libgnome = import ./libgnome.nix {
    inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser
-      popt zlib esound gettext;
+      popt zlib esound gettext intltool;
    input = platform.libgnome;
  };

@ -84,39 +92,48 @@ rec {
    input = platform.libglade;
  };

+  libglademm = import ./libglademm.nix {
+    inherit fetchurl stdenv pkgconfig libglade;
+    inherit (gtkLibs) gtkmm;
+  };
+
  libgnomecanvas = stdenv.mkDerivation {
    inherit (platform.libgnomecanvas) name src;
-    buildInputs = [pkgconfig libglade perl perlXMLParser gail gettext];
+    buildInputs = [
+      pkgconfig libglade perl perlXMLParser gail
+      gettext intltool
+    ];
    propagatedBuildInputs = [gtk libart_lgpl];
  };

  libbonobo = import ./libbonobo.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex gettext;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2
+      dbus dbus_glib libxml2 popt flex
+      gettext intltool;
    yacc = bison;
    input = platform.libbonobo;
  };

  libbonoboui = import ./libbonoboui.nix {
    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
-            libgnome libgnomecanvas gettext;
+            libgnome libgnomecanvas gettext intltool;
    input = platform.libbonoboui;
  };

  libgnomeui = import ./libgnomeui.nix {
    inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser
-      libjpeg esound gettext;
+      libjpeg esound gettext intltool;
    input = platform.libgnomeui;
  };

  intltool = import ./intltool.nix {
    inherit fetchurl stdenv pkgconfig perl perlXMLParser;
-    input = platform.intltool;
  };


  # Desktop

-  desktop = import ./src-gnome-desktop-2.22.1.nix {
+  desktop = import ./src-gnome-desktop-2.26.0.nix {
    inherit fetchurl;
  };

@ -125,7 +142,7 @@ rec {

    buildInputs = [
      perl perlXMLParser pkgconfig popt libxml2
-      glib pango bison flex gettext
+      glib pango bison flex gettext intltool
    ];

    propagatedBuildInputs = [libxml2 libart_lgpl];
@ -136,7 +153,7 @@ rec {

    buildInputs = [
      perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme
-      gettext
+      gettext intltool
    ];

    propagatedBuildInputs = [
@ -145,7 +162,7 @@ rec {
  };

  gtkhtml = import ./gtkhtml.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext intltool enchant isocodes;
    inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme;
    input = desktop.gtkhtml;
  };
@ -161,7 +178,10 @@ rec {

  gnomekeyring = stdenv.mkDerivation {
    inherit (desktop.gnomekeyring) name src;
-    buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext GConf libgcrypt libtasn1];
+    buildInputs = [
+      pkgconfig gtk glib perl perlXMLParser gettext intltool
+      GConf libgcrypt libtasn1 dbus dbus_glib python
+    ];
    CFLAGS = "-DENABLE_NLS=0";
  };

@ -201,21 +221,30 @@ rec {
    };
  };

-  gnomedesktop = import ./gnome-desktop.nix {
-    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser
-      libjpeg gettext which python libxml2Python libxslt;
-    input = desktop.gnomedesktop;
+  gnomedesktop = stdenv.mkDerivation {
+    inherit (desktop.gnomedesktop) name src;
+
+    # !!! should get rid of libxml2Python, see gnomedocutils
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser gtk glib libgnomeui
+      scrollkeeper libjpeg gnomedocutils gettext which
+      python libxml2Python libxslt intltool
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
  };

-  libwnck = import ./libwnck.nix {
-    inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext;
-    input = desktop.libwnck;
+  libwnck = stdenv.mkDerivation {
+    inherit (desktop.libwnck) name src;
+    buildInputs = [pkgconfig gtk perl perlXMLParser gettext intltool];
  };

-  gnomemenus = import ./gnome-menus.nix {
-    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser
-      python gettext;
-    input = desktop.gnomemenus;
+  gnomemenus = stdenv.mkDerivation {
+    inherit (desktop.gnomemenus) name src;
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib python gettext intltool
+    ];
  };

  librsvg = stdenv.mkDerivation {
@ -225,7 +254,10 @@ rec {

  libgweather = stdenv.mkDerivation {
    inherit (desktop.libgweather) name src;
-    buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs];
+    buildInputs = [
+      gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs
+      intltool libsoup
+    ];
  };

  gnomepanel = stdenv.mkDerivation {
@ -261,7 +293,7 @@ rec {

  metacity = import ./metacity.nix {
    inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk
-      GConf startupnotification gettext libcm;
+      GConf startupnotification gettext libcm intltool;
    inherit (xlibs) libXinerama libXrandr libXcursor
      libXcomposite libXfixes libXdamage;
    enableCompositor = true;
@ -274,47 +306,65 @@ rec {
    input = desktop.gnomedocutils;
  };

-  gconfeditor = import ./gconf-editor.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      gettext libxslt;
-    input = desktop.gconfeditor;
+  gconfeditor = stdenv.mkDerivation {
+    inherit (desktop.gconfeditor) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser GConf gnomedocutils
+      gtk libgnome libgnomeui gettext libxslt intltool
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
  };

-  vte = import ./vte.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser ncurses
-      python gettext;
-    input = desktop.vte;
+  vte = stdenv.mkDerivation {
+    inherit (desktop.vte) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib gtk python gettext intltool
+    ];
+  
+    propagatedBuildInputs = [ncurses];
  };
  
  gnometerminal = stdenv.mkDerivation {
    inherit (desktop.gnometerminal) name src;

    buildInputs = [
-      pkgconfig perl perlXMLParser gtk GConf libglade
-      libgnomeui startupnotification gnomevfs vte
-      gnomedocutils gettext which scrollkeeper
-      python libxml2Python libxslt
+      pkgconfig perl perlXMLParser gtk GConf libglade libgnomeui
+      startupnotification gnomevfs vte gnomedocutils gettext which
+      scrollkeeper python libxml2Python libxslt intltool
+      dbus_glib
    ];

    configureFlags = "--disable-scrollkeeper";
  };

-  libgtop = import ./libgtop.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      popt gettext;
-    input = desktop.libgtop;
+  libgtop = stdenv.mkDerivation {
+    inherit (desktop.libgtop) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib popt gettext intltool
+    ];
  };
  
-  gnomeutils = import ./gnome-utils.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      gettext libxslt /*  which python libxml2Python libxslt */;
-    inherit (xlibs) libXmu;
-    input = desktop.gnomeutils;
-  };
+  gnomeutils = stdenv.mkDerivation {
+    inherit (desktop.gnomeutils) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib gtk libgnome libgnomeui
+      libglade libgnomeprintui gnomedesktop gnomepanel libgtop
+      scrollkeeper gnomedocutils gettext libxslt xlibs.libXmu intltool
+    ]; 

+    configureFlags = "--disable-scrollkeeper";
+  };
+  
  gtkdoc = import ./gtkdoc.nix {
    inherit (platform) gtkdoc;
-    inherit stdenv args;
+    inherit stdenv pkgconfig gnomedocutils perl python libxml2
+      xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt
+      scrollkeeper;
  };
  
 };
--- a/pkgs/desktops/gnome/gconf-editor.nix
+++ b/pkgs/desktops/gnome/gconf-editor.nix
@ -1,14 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, gettext, libxslt
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.GConf gnome.gnomedocutils
-    gnome.gtk gnome.libgnome gnome.libgnomeui gettext libxslt
-  ];
-
-  configureFlags = "--disable-scrollkeeper";
-}
--- a/pkgs/desktops/gnome/gnome-desktop.nix
+++ b/pkgs/desktops/gnome/gnome-desktop.nix
@ -1,17 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, libjpeg, gettext, which, python, libxml2Python, libxslt
-}:
-
-# !!! should get rid of libxml2Python, see gnomedocutils
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.libgnomeui
-    gnome.scrollkeeper libjpeg gnome.gnomedocutils gettext which
-    python libxml2Python libxslt    
-  ];
-
-  configureFlags = "--disable-scrollkeeper";
-}
--- a/pkgs/desktops/gnome/gnome-menus.nix
+++ b/pkgs/desktops/gnome/gnome-menus.nix
@ -1,10 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, python, gettext
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib python gettext
-  ];
-}
--- a/pkgs/desktops/gnome/gnome-utils.nix
+++ b/pkgs/desktops/gnome/gnome-utils.nix
@ -1,23 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, gettext, libxslt, libXmu
-#, which, python, libxml2Python, libxslt
-}:
-
-# !!! should get rid of libxml2Python, see gnomedocutils
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib gnome.gtk gnome.libgnome
-    gnome.libgnomeui gnome.libglade gnome.libgnomeprintui
-    gnome.gnomedesktop gnome.gnomepanel gnome.libgtop gnome.scrollkeeper
-    gnome.gnomedocutils gettext libxslt libXmu
-    # gnome.gtk gnome.GConf gnome.libglade
-    #gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte
-    #gnome.gnomedocutils gettext which gnome.scrollkeeper
-    #python libxml2Python libxslt
-  ];
-
-  configureFlags = "--disable-scrollkeeper";
-}
--- a/pkgs/desktops/gnome/gtkdoc.nix
+++ b/pkgs/desktops/gnome/gtkdoc.nix
@ -1,12 +1,14 @@
-{ stdenv, gtkdoc, args }: with args;
+{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl, python
+, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_43
+, libxslt, scrollkeeper }:

 stdenv.mkDerivation {
  inherit (gtkdoc) name src;

-  inherit docbook_xml_dtd_412;
-  buildInputs = [ perl 
-    libxml2
-    xmlto  docbook2x  docbook_xsl docbook_xml_dtd_412 libxslt ];
+  inherit docbook_xml_dtd_43;
+  buildInputs = [ pkgconfig perl python gnomedocutils
+    libxml2 scrollkeeper
+    xmlto  docbook2x  docbook_xsl docbook_xml_dtd_43 libxslt ];


  # maybe there is a better way to pass the needed dtd and xsl files
@ -18,9 +20,10 @@ stdenv.mkDerivation {
    <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
    <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
      <nextCatalog  catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" />
-      <nextCatalog  catalog="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" />
+      <nextCatalog  catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" />
    </catalog>
    EOF
-    configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml"
+
+    configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper";
  '';
 }
--- a/pkgs/desktops/gnome/gtkhtml.nix
+++ b/pkgs/desktops/gnome/gtkhtml.nix
@ -1,6 +1,6 @@
 { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, atk, gail, gtk
 , libgnomeprint, libgnomeprintui, libgnomeui, libglade, gnomeicontheme
-, libjpeg, gettext
+, libjpeg, gettext, intltool, enchant, isocodes
 }:

 # TODO build complains about missing libsoup and soup. Optional dependency?
@ -12,7 +12,7 @@ stdenv.mkDerivation {
    perl perlXMLParser pkgconfig libjpeg
    atk gail gtk
    libglade libgnomeprint libgnomeprintui libgnomeui
-    gnomeicontheme gettext
+    gnomeicontheme gettext intltool enchant isocodes
  ];
 }

--- a/pkgs/desktops/gnome/intltool.nix
+++ b/pkgs/desktops/gnome/intltool.nix
@ -1,6 +1,13 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser}:

-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser];
+stdenv.mkDerivation rec {
+  name = "intltool-0.40.6";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/${name}.tar.bz2";
+    sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ perl perlXMLParser ];
 }
--- a/pkgs/desktops/gnome/libbonobo.nix
+++ b/pkgs/desktops/gnome/libbonobo.nix
@ -1,4 +1,6 @@
-{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex, gettext}:
+{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser
+, dbus, dbus_glib, ORBit2, libxml2
+, popt, yacc, flex, gettext, intltool }:

 assert pkgconfig != null && perl != null && ORBit2 != null
  && libxml2 != null && popt != null && yacc != null && flex != null;
@ -6,6 +8,10 @@ assert pkgconfig != null && perl != null && ORBit2 != null
 # todo 2.8.1 doesn;t work
 stdenv.mkDerivation {
  inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 yacc flex gettext];
+  buildInputs = [
+    pkgconfig perl perlXMLParser libxml2 yacc flex
+    dbus dbus_glib
+    gettext intltool
+  ];
  propagatedBuildInputs = [ORBit2 popt];
 }
--- a/pkgs/desktops/gnome/libbonoboui.nix
+++ b/pkgs/desktops/gnome/libbonoboui.nix
@ -1,5 +1,5 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome
-, libgnomecanvas, gettext}:
+, libgnomecanvas, gettext, intltool }:

 assert pkgconfig != null && perl != null && libxml2 != null
  && libglade != null && libgnome != null && libgnomecanvas != null;
@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null
 # TODO 2.8.1 doesn't work
 stdenv.mkDerivation {
  inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser libglade gettext];
+  buildInputs = [ pkgconfig perl perlXMLParser libglade gettext intltool ];
  propagatedBuildInputs = [libxml2 libgnome libgnomecanvas];

  LDFLAGS="-lglib-2.0"; # !!! why?
--- a/pkgs/desktops/gnome/libglademm.nix
+++ b/pkgs/desktops/gnome/libglademm.nix
@ -0,0 +1,34 @@
+{ fetchurl, stdenv, pkgconfig, libglade, gtkmm }:
+
+stdenv.mkDerivation rec {
+  name = "libglademm-2.6.7";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/${name}.tar.bz2";
+    sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  # `libglade' must be propagated so that `pkg-config libglademm
+  # --libs' (or `--cflags') works.
+  propagatedBuildInputs = [ libglade gtkmm ];
+
+  meta = {
+    description = "C++ interface to the libglade graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+  };
+}
--- a/pkgs/desktops/gnome/libgnome.nix
+++ b/pkgs/desktops/gnome/libgnome.nix
@ -1,5 +1,5 @@
 { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, popt, zlib, esound, gettext
+, popt, zlib, esound, gettext, intltool
 }:

 # !!! TODO CHECK:
@ -9,6 +9,6 @@

 stdenv.mkDerivation {
  inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext];
+  buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext intltool];
  propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf];
 }
--- a/pkgs/desktops/gnome/libgnomeui.nix
+++ b/pkgs/desktops/gnome/libgnomeui.nix
@ -1,11 +1,12 @@
 { input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, esound, libjpeg, gettext
+, esound, libjpeg, gettext, intltool
 }:

 stdenv.mkDerivation {
  inherit (input) name src;
  buildInputs = [
    pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext
+    intltool
  ];
  propagatedBuildInputs = [
    gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg
--- a/pkgs/desktops/gnome/libgtop.nix
+++ b/pkgs/desktops/gnome/libgtop.nix
@ -1,11 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser, popt
-, gettext
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib popt gettext
-  ];
-}
--- a/pkgs/desktops/gnome/libwnck.nix
+++ b/pkgs/desktops/gnome/libwnck.nix
@ -1,6 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, gtk, perl, perlXMLParser, gettext}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig gtk perl perlXMLParser gettext];
-}
--- a/pkgs/desktops/gnome/metacity.nix
+++ b/pkgs/desktops/gnome/metacity.nix
@ -1,6 +1,6 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk
 , GConf, startupnotification, libXinerama, libXrandr, libXcursor
-, gettext
+, gettext, intltool

 , enableCompositor ? false
 , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null
@ -14,11 +14,11 @@ stdenv.mkDerivation {
  
  buildInputs = [
    pkgconfig perl perlXMLParser glib gtk GConf startupnotification
-    libXinerama libXrandr libXcursor gettext
+    libXinerama libXrandr libXcursor gettext intltool
  ]
-  ++ (if enableCompositor then [libXcomposite libXfixes libXdamage libcm] else []);
+  ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm];
  
-  configureFlags = "
+  configureFlags = ''
    ${if enableCompositor then "--enable-compositor" else ""}
-  ";
+  '';
 }
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix
@ -1,536 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  alacarte = {
-    name = "alacarte-0.10.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/alacarte-0.10.2.tar.bz2;
-      md5 = "abf5d95b968a34d034c47e3bfab95719";
-    };
-  };
-  bugbuddy = {
-    name = "bug-buddy-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/bug-buddy-2.16.1.tar.bz2;
-      md5 = "c15641ebfd90a91f185179d67bde88e3";
-    };
-  };
-  controlcenter = {
-    name = "control-center-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/control-center-2.16.2.tar.bz2;
-      md5 = "fc6e2f5de89f4482758395d941ec6ae1";
-    };
-  };
-  dasher = {
-    name = "dasher-4.2.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/dasher-4.2.2.tar.bz2;
-      md5 = "eff0aeda6c02b03263c4712f56bd3b1c";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/deskbar-applet-2.16.2.tar.bz2;
-      md5 = "6a4780813a55e2f464e69cdfac89894d";
-    };
-  };
-  eel = {
-    name = "eel-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eel-2.16.3.tar.bz2;
-      md5 = "8a5fa25a9c1fb7cb58ea9fae9d27f8f7";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/ekiga-2.0.3.tar.bz2;
-      md5 = "37c57468c7c15ff9bcea91e7fc32aea9";
-    };
-  };
-  eog = {
-    name = "eog-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eog-2.16.3.tar.bz2;
-      md5 = "82468185d766b9676d7f06c124939f9d";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/epiphany-2.16.3.tar.bz2;
-      md5 = "3ee93d168eb5720a96f4c7adf2cdf2d4";
-    };
-  };
-  evince = {
-    name = "evince-0.6.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evince-0.6.1.tar.bz2;
-      md5 = "55a1d4af3cac209c7cfbe83b7ffcee1d";
-    };
-  };
-  evolution = {
-    name = "evolution-2.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-2.8.3.tar.bz2;
-      md5 = "099876b347b114ec08ce6998b4a48d8c";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-1.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-data-server-1.8.3.tar.bz2;
-      md5 = "f6a824f2553fd97555b8785a452fb6ab";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-exchange-2.8.3.tar.bz2;
-      md5 = "8a6be6640c7824285088f6a2e98f12a4";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-webcal-2.8.0.tar.bz2;
-      md5 = "6dd4821ce90e238acbd8a959fee1ee14";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/fast-user-switch-applet-2.16.0.tar.bz2;
-      md5 = "749de0f0279991515ca8d82526f5b329";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/file-roller-2.16.3.tar.bz2;
-      md5 = "3ee134c04b73a584c9ec494d5e542c6d";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.8.25";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gcalctool-5.8.25.tar.bz2;
-      md5 = "28074081a9625b8b3d1f7499bc27bbfb";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gconf-editor-2.16.0.tar.bz2;
-      md5 = "e52b3177ef6ebd1fcf2c84acbe90a663";
-    };
-  };
-  gdm = {
-    name = "gdm-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gdm-2.16.5.tar.bz2;
-      md5 = "8f223458b0e957650f6d865a06a271e4";
-    };
-  };
-  gedit = {
-    name = "gedit-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gedit-2.16.2.tar.bz2;
-      md5 = "9ed4fb2891d07c022b487723d1c72161";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-applets-2.16.2.tar.bz2;
-      md5 = "1a46b8557ff05ca75e7db6adb4dd6707";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-backgrounds-2.16.2.tar.bz2;
-      md5 = "765c19d28d39483769687691941129c9";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-desktop-2.16.3.tar.bz2;
-      md5 = "42c21d18589f4955bb0d70c82236d999";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-doc-utils-0.8.0.tar.bz2;
-      md5 = "50726331fef362dc94921f366fcc8ed2";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-games-2.16.3.tar.bz2;
-      md5 = "88baa9ab64b84bfcac2a1ba05f84d2f9";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-icon-theme-2.16.1.tar.bz2;
-      md5 = "4a5da64a6084fdddf056e553a929c169";
-    };
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-0.6.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-0.6.0.tar.bz2;
-      md5 = "1e3a3a12b19fc5ebe95363658c2256d8";
-    };
-  };
-  gnomekeyringmanager = {
-    name = "gnome-keyring-manager-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-manager-2.16.0.tar.bz2;
-      md5 = "d63bfa5e9cfe334694438a74c157344c";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.13.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-mag-0.13.2.tar.bz2;
-      md5 = "093c153c0d8bad40d40d4f7c21be8975";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-media-2.16.1.tar.bz2;
-      md5 = "4fa1e8e8bd31e2db1cb49679170a98a8";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-menus-2.16.1.tar.bz2;
-      md5 = "a5c467abe68003d23ec09a795ebfd29f";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-netstatus-2.12.0.tar.bz2;
-      md5 = "a5f23731a3bf232969e82afef8792a36";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-nettool-2.16.0.tar.bz2;
-      md5 = "58d9171efdf368910934fb71194763eb";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-panel-2.16.2.tar.bz2;
-      md5 = "82b98a9b2685cca2d381e185cae47596";
-    };
-  };
-  gnomepowermanager = {
-    name = "gnome-power-manager-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-power-manager-2.16.3.tar.bz2;
-      md5 = "48166c6aaf41f2225090517ae655d05d";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-python-desktop-2.16.0.tar.bz2;
-      md5 = "ea79fe3e6a65d8380539a9ef6eed963f";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-screensaver-2.16.3.tar.bz2;
-      md5 = "cbd3e3b96b24038c7838b89acae318dd";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-session-2.16.3.tar.bz2;
-      md5 = "d35a7f541adecc112b7c73f95353a183";
-    };
-  };
-  gnomesharp = {
-    name = "gnome-sharp-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-sharp-2.16.0.tar.bz2;
-      md5 = "09034669acec52f9d9818d9a31c032d5";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-speech-0.4.8.tar.bz2;
-      md5 = "f1abbdc7b23fd62f98153aff13161a0d";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-monitor-2.16.1.tar.bz2;
-      md5 = "37b44e0e84865fc0aba8bfd4bbdf2338";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-tools-2.14.0.tar.bz2;
-      md5 = "3aded3a37f4f5b4962bf253d25cebea1";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-terminal-2.16.1.tar.bz2;
-      md5 = "861e1b780819214b4d5a398e7999c093";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-themes-2.16.3.tar.bz2;
-      md5 = "ecb4d4b9b90507ba4f3d6e9e63d872d5";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-user-docs-2.16.1.tar.bz2;
-      md5 = "4b0abfe5e24438414c22083851bae19e";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-utils-2.16.2.tar.bz2;
-      md5 = "4e70e667a78fc5bee4a4b8f2f3ae8440";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-2.15.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-volume-manager-2.15.0.tar.bz2;
-      md5 = "d723bc2069fd19cf1c31961fbc1cf3c8";
-    };
-  };
-  gok = {
-    name = "gok-1.2.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gok-1.2.1.tar.bz2;
-      md5 = "cba5eef61ed1a8f6a83fa18015781721";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-base-0.10.7.tar.bz2;
-      md5 = "d66b09de993aefd22d8fc341e5f50521";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-good-0.10.3.tar.bz2;
-      md5 = "2b59bce477349628ee549c2ce1d80a3a";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gstreamer-0.10.8.tar.bz2;
-      md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.8.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtk-engines-2.8.2.tar.bz2;
-      md5 = "0c5b0254b57910b1ebcda47ac6a3b1ba";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.12.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtkhtml-3.12.2.tar.bz2;
-      md5 = "8c943647fd26cf4594b2e97055e22584";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-1.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtksourceview-1.8.3.tar.bz2;
-      md5 = "1da36ae813b6234dc9d327c3500afef9";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-1.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gucharmap-1.8.0.tar.bz2;
-      md5 = "a75cc3dcc9fb3d2edecc4da936e80e3a";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.1.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgail-gnome-1.1.3.tar.bz2;
-      md5 = "1d12c5375b3404f4f20b214b763e5225";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprint-2.12.1.tar.bz2;
-      md5 = "ea729d4968fe2169c84efb12ace5f6cc";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprintui-2.12.1.tar.bz2;
-      md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.14.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgtop-2.14.6.tar.bz2;
-      md5 = "4aa425a6b66b976be6f364904eeda78a";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/librsvg-2.16.1.tar.bz2;
-      md5 = "37e046571097ff7ce77ae6e07f096324";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.99";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libsoup-2.2.99.tar.bz2;
-      md5 = "b2f5df25de4a5c00653d1667eb1b5687";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libwnck-2.16.3.tar.bz2;
-      md5 = "0a36d269b19f78df7bd861033792f550";
-    };
-  };
-  metacity = {
-    name = "metacity-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/metacity-2.16.5.tar.bz2;
-      md5 = "7ac14eb4caffbb15df91b70b0def2f5e";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-2.16.3.tar.bz2;
-      md5 = "05a0fe98d524ca5287da21845ab8490c";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-cd-burner-2.16.3.tar.bz2;
-      md5 = "6e3653c849e24aacd7e29b4030327b4e";
-    };
-  };
-  orca = {
-    name = "orca-1.0.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/orca-1.0.1.tar.bz2;
-      md5 = "860172c6dadf6a655d8e0b2b3df90628";
-    };
-  };
-  scrollkeeper = {
-    name = "scrollkeeper-0.3.14";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2;
-      md5 = "b175e582a6cec3e50a9de73a5bb7455a";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/sound-juicer-2.16.3.tar.bz2;
-      md5 = "cfe4199f4f50c2a8f8178db4097209e4";
-    };
-  };
-  startupnotification = {
-    name = "startup-notification-0.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/startup-notification-0.8.tar.bz2;
-      md5 = "d9b2e9fba18843314ae42334ceb4336d";
-    };
-  };
-  systemtoolsbackends = {
-    name = "system-tools-backends-1.4.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/system-tools-backends-1.4.2.tar.bz2;
-      md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
-    };
-  };
-  tomboy = {
-    name = "tomboy-0.4.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/tomboy-0.4.1.tar.bz2;
-      md5 = "40e0f51d832d04f762851fc9a88c01ea";
-    };
-  };
-  totem = {
-    name = "totem-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/totem-2.16.5.tar.bz2;
-      md5 = "fa8eb90b52d70d876e1d42ec43cf8448";
-    };
-  };
-  vino = {
-    name = "vino-2.13.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vino-2.13.5.tar.bz2;
-      md5 = "9bc8c3f0e639fdc7b9ed023501308359";
-    };
-  };
-  vte = {
-    name = "vte-0.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vte-0.14.2.tar.bz2;
-      md5 = "eceafec1b564cc059fa3407f83631817";
-    };
-  };
-  yelp = {
-    name = "yelp-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/yelp-2.16.2.tar.bz2;
-      md5 = "ac55332d62c1871b3de92b5c1f0befaa";
-    };
-  };
-  zenity = {
-    name = "zenity-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/zenity-2.16.3.tar.bz2;
-      md5 = "773579408f3237b38fa4d18a182c0ca6";
-    };
-  };
-}
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
@ -1,603 +0,0 @@
-# Note: this file was generated automatically by make-listing.pl!
-
-{fetchurl} : {
-  alacarte = {
-    name = "alacarte-0.11.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/alacarte-0.11.5.tar.bz2;
-      md5 = "e4dc193d36c76b974e66e517e9c7ea33";
-    };
-  };
-  bugbuddy = {
-    name = "bug-buddy-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/bug-buddy-2.22.0.tar.bz2;
-      md5 = "092e1f91d0be4ca133cd0650622a6b06";
-    };
-  };
-  cheese = {
-    name = "cheese-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/cheese-2.22.1.tar.bz2;
-      md5 = "0f3c583081f56263541f9a8644569829";
-    };
-  };
-  dasher = {
-    name = "dasher-4.7.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/dasher-4.7.3.tar.bz2;
-      md5 = "f97dfd3c54f6d6c5f2873d4f82cb33c4";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/deskbar-applet-2.22.1.tar.bz2;
-      md5 = "b506328780abaa6a7e0e59a1f262c22c";
-    };
-  };
-  eel = {
-    name = "eel-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eel-2.22.1.tar.bz2;
-      md5 = "dd393ad7de2e230a7604af9560140920";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.12";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/ekiga-2.0.12.tar.bz2;
-      md5 = "d86636c2195b4fb95aec427c17570008";
-    };
-  };
-  eog = {
-    name = "eog-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eog-2.22.1.tar.bz2;
-      md5 = "ca40ada77bda9b396809e08782f5d718";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.22.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/epiphany-2.22.1.1.tar.bz2;
-      md5 = "24bb8c430a6165b9c43a2ed0452cc6a5";
-    };
-  };
-  evince = {
-    name = "evince-2.22.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evince-2.22.1.1.tar.bz2;
-      md5 = "568ff7211a185d71d0e9de15a07f4987";
-    };
-  };
-  evolution = {
-    name = "evolution-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-2.22.1.tar.bz2;
-      md5 = "b8eddd6e26b59b1fe6ad0ae849916836";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-data-server-2.22.1.tar.bz2;
-      md5 = "1972fa3dbd46c25216b00c1d35f83eaf";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-exchange-2.22.1.tar.bz2;
-      md5 = "213db2462016f18ad3261d3e7fb00004";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.21.92";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-webcal-2.21.92.tar.bz2;
-      md5 = "049ea414f6d82a1e4b1e88f71a4f19cb";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/fast-user-switch-applet-2.22.0.tar.bz2;
-      md5 = "540f2567582e77cdd673dde3546b61db";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/file-roller-2.22.2.tar.bz2;
-      md5 = "68f89c4723e4f2d2e58b15f7b2a20d23";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gcalctool-5.22.1.tar.bz2;
-      md5 = "a4103972f07e85cf242b9a5e4efcfa91";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gconf-editor-2.22.0.tar.bz2;
-      md5 = "7ca99aec214dd855b5de7dacc8937055";
-    };
-  };
-  gdm = {
-    name = "gdm-2.20.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gdm-2.20.5.tar.bz2;
-      md5 = "151d90901abc2088a0825ee1dd8da7f6";
-    };
-  };
-  gedit = {
-    name = "gedit-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gedit-2.22.1.tar.bz2;
-      md5 = "ee797f4e2eed291dc28ef8ff7082445e";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-applets-2.22.1.tar.bz2;
-      md5 = "d6df0a48c875b77a4fafe47fc81bde29";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-backgrounds-2.22.0.tar.bz2;
-      md5 = "1997e020288ea6b91ed460c2c6bfc8d4";
-    };
-  };
-  gnomecontrolcenter = {
-    name = "gnome-control-center-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-control-center-2.22.1.tar.bz2;
-      md5 = "170815bcf2627bf64436283f86c751aa";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-2.22.1.tar.bz2;
-      md5 = "39d1421dbfe54d0838a00b055edcb5cf";
-    };
-  };
-  gnomedesktopsharp = {
-    name = "gnome-desktop-sharp-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-sharp-2.20.1.tar.bz2;
-      md5 = "874cfcf8a6547476906b638355a0ed2f";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.12.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-doc-utils-0.12.2.tar.bz2;
-      md5 = "e1a9e9ba923b8950f8803c90ebeaadb8";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.22.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-games-2.22.1.1.tar.bz2;
-      md5 = "57500e063a6f26f2fbfd364a68842297";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.25/2.25.1/sources/gnome-icon-theme-2.24.0.tar.bz2;
-      sha256 = "1ciid3p21n5m2ixdc7b6sqjvw68pzg1adxljrcy7snnnxbwqj7xp";
-    };
-    #src = fetchurl {
-    #  url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2;
-    #  md5 = "a4c03092da28ad53ed3867aef83f29d9";
-    #};
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-keyring-2.22.1.tar.bz2;
-      md5 = "4ca9c19fa6ada61cdc93ab24214b5c4f";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.15.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-mag-0.15.0.tar.bz2;
-      md5 = "a297f2b2fae4cd0cde2a30bfacc4c380";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-media-2.22.0.tar.bz2;
-      md5 = "e3fabb87abd2731d7f345d724b40333a";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-menus-2.22.1.tar.bz2;
-      md5 = "6e31d10da8c1ef315ca2d7f02e807395";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-netstatus-2.12.1.tar.bz2;
-      md5 = "8651ca1694a6c222ae5cad6e21814d24";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-nettool-2.22.0.tar.bz2;
-      md5 = "290dd50a08a3859332afb6daf46dde25";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.22.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-panel-2.22.1.1.tar.bz2;
-      md5 = "c80f265af2dd009917aece662fd6ab37";
-    };
-  };
-  gnomepowermanager = {
-    name = "gnome-power-manager-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-power-manager-2.22.1.tar.bz2;
-      md5 = "bfb10f96771dd161ff16171f78a7dc21";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-python-desktop-2.22.0.tar.bz2;
-      md5 = "504877a973f6abc0788283232cd703cb";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-screensaver-2.22.2.tar.bz2;
-      md5 = "496a2e0cba5c27db57a72ecf2e17f789";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-session-2.22.1.tar.bz2;
-      md5 = "8cd499f49cecfdcb32fd4f97965e9017";
-    };
-  };
-  gnomesettingsdaemon = {
-    name = "gnome-settings-daemon-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-settings-daemon-2.22.1.tar.bz2;
-      md5 = "959d0d289ed81f950004fa64dbcff89d";
-    };
-  };
-  gnomesharp = {
-    name = "gnome-sharp-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-sharp-2.20.0.tar.bz2;
-      md5 = "1cdb85652a6504afe6fad569daa901ee";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.18";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-speech-0.4.18.tar.bz2;
-      md5 = "f325037fdc74e19d943f397066454ac3";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-monitor-2.22.0.tar.bz2;
-      md5 = "7b809a4db72902ca5f47a63f62917d14";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-tools-2.22.0.tar.bz2;
-      md5 = "6559bb97fc75bc28b559dc530571d527";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-terminal-2.22.1.tar.bz2;
-      md5 = "0e6c71def04b2a56e8d6725cef7950b4";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-themes-2.22.0.tar.bz2;
-      md5 = "e902194175c6f7298bd53e5aa7eef56b";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-user-docs-2.22.0.tar.bz2;
-      md5 = "f3af808e754701b83105eab2f5ca690c";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.20.0.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-utils-2.20.0.1.tar.bz2;
-      md5 = "2d4385df2fb566b437b283bd2ce70190";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-volume-manager-2.22.1.tar.bz2;
-      md5 = "a0cb86f541515f33443c848879d04785";
-    };
-  };
-  gok = {
-    name = "gok-1.3.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gok-1.3.7.tar.bz2;
-      md5 = "14b2407604ceec0ffcbf4866fef35502";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.19";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-base-0.10.19.tar.bz2;
-      md5 = "9c9614cbb6497b7fee1c954b9d5ae3b7";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-good-0.10.6.tar.bz2;
-      md5 = "25f111360c2930705b91b4fcf93ae5c5";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.19";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gstreamer-0.10.19.tar.bz2;
-      md5 = "12072a3168420350ea450749a3b63be8";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.14.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtk-engines-2.14.1.tar.bz2;
-      md5 = "eef8ee067bad0b76b9773aef1994930c";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.18.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtkhtml-3.18.1.tar.bz2;
-      md5 = "e314eba21158afa018d47f63c67000d3";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-2.2.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtksourceview-2.2.1.tar.bz2;
-      md5 = "1c5bd86f854ead3aedb96463ebbb275f";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gucharmap-2.22.1.tar.bz2;
-      md5 = "cd5f6ae44d29a7582dc179ebc64b42b4";
-    };
-  };
-  gvfs = {
-    name = "gvfs-0.2.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gvfs-0.2.3.tar.bz2;
-      md5 = "cefc1279b98838f26bc7878029ed13b3";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgail-gnome-1.20.0.tar.bz2;
-      md5 = "5a7662e3d637c86baa95a50adb225e56";
-    };
-  };
-  libgnomekbd = {
-    name = "libgnomekbd-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomekbd-2.22.0.tar.bz2;
-      md5 = "a8b64278ae3471583607d734db9347eb";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.18.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprint-2.18.4.tar.bz2;
-      md5 = "bc460f875425a956176f07440b3fa46e";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.18.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprintui-2.18.2.tar.bz2;
-      md5 = "88b404e7b62bb9ad96b25908c1315dcd";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgtop-2.22.1.tar.bz2;
-      md5 = "d157224c951f1284132361e50a8195b5";
-    };
-  };
-  libgweather = {
-    name = "libgweather-2.22.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgweather-2.22.1.1.tar.bz2;
-      md5 = "6b0e12931db8c640992bef75bd3cc24b";
-    };
-  };
-  liboobs = {
-    name = "liboobs-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/liboobs-2.22.0.tar.bz2;
-      md5 = "1b090ecd6c0df58b131795ff9a5c9057";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/librsvg-2.22.2.tar.bz2;
-      md5 = "aae602677ce201b1a0ed6a0c18c207f2";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.4.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libsoup-2.4.1.tar.bz2;
-      md5 = "d0fc91ccb9da401e9e40d2f4612bdac9";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libwnck-2.22.1.tar.bz2;
-      md5 = "6b16643a107d9fc37136335939ab3f1a";
-    };
-  };
-  metacity = {
-    name = "metacity-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/metacity-2.22.0.tar.bz2;
-      md5 = "8cb6d02cf66a1003532b4f5d2754d696";
-    };
-  };
-  mousetweaks = {
-    name = "mousetweaks-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/mousetweaks-2.22.1.tar.bz2;
-      md5 = "16ef7e51728c27c7ea3378a9f296f352";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-2.22.2.tar.bz2;
-      md5 = "4758815c46f350bd314d9e104f0a1b72";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-cd-burner-2.22.1.tar.bz2;
-      md5 = "6bf96cb55a11813a26118eabafa69143";
-    };
-  };
-  orca = {
-    name = "orca-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/orca-2.22.1.tar.bz2;
-      md5 = "ef477a5b43846060ccbc636f5b731f21";
-    };
-  };
-  pygtksourceview = {
-    name = "pygtksourceview-2.2.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/pygtksourceview-2.2.0.tar.bz2;
-      md5 = "5dd0a9aa99168f989ed04123a65077e4";
-    };
-  };
-  seahorse = {
-    name = "seahorse-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/seahorse-2.22.1.tar.bz2;
-      md5 = "e0e409ab825c954b5937b8b115dd5118";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/sound-juicer-2.22.0.tar.bz2;
-      md5 = "20f83a28915b7d7029198396258d1b4f";
-    };
-  };
-  swfdecgnome = {
-    name = "swfdec-gnome-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/swfdec-gnome-2.22.2.tar.bz2;
-      md5 = "7de99aff7978bc870e1eabb4ba8f0fc7";
-    };
-  };
-  tomboy = {
-    name = "tomboy-0.10.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/tomboy-0.10.1.tar.bz2;
-      md5 = "c9b2534e2ea58bf0a8cf7c8dc5643fc1";
-    };
-  };
-  totem = {
-    name = "totem-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-2.22.1.tar.bz2;
-      md5 = "f4920ffef2a90f019ff7e9d6a411e532";
-    };
-  };
-  totemplparser = {
-    name = "totem-pl-parser-2.22.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-pl-parser-2.22.2.tar.bz2;
-      md5 = "d2f5e023de8d24c21e863dd7257594f0";
-    };
-  };
-  vinagre = {
-    name = "vinagre-0.5.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vinagre-0.5.1.tar.bz2;
-      md5 = "48e0079631952216743720fa1c59f621";
-    };
-  };
-  vino = {
-    name = "vino-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vino-2.22.1.tar.bz2;
-      md5 = "01c5ffd0b252edb8921bfcca88438339";
-    };
-  };
-  vte = {
-    name = "vte-0.16.13";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vte-0.16.13.tar.bz2;
-      md5 = "40480f20f6b7664f3d364e4f2ed27889";
-    };
-  };
-  yelp = {
-    name = "yelp-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/yelp-2.22.1.tar.bz2;
-      md5 = "a292c6712bb820e6aa2ade84ebdc9609";
-    };
-  };
-  zenity = {
-    name = "zenity-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/zenity-2.22.1.tar.bz2;
-      md5 = "4e1e1f080e7253ee4f6a5cee3306c78d";
-    };
-  };
-}
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix
@ -0,0 +1,613 @@
+# Note: this file was generated automatically by make-listing.pl!
+
+{fetchurl} : {
+  alacarte = {
+    name = "alacarte-0.11.10";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/alacarte-0.11.10.tar.bz2;
+      md5 = "1888f6206c5bf4659214ac1b7487efd6";
+    };
+  };
+  brasero = {
+    name = "brasero-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/brasero-2.26.0.tar.bz2;
+      md5 = "ef968fe98874da4e26b61591ee57be4a";
+    };
+  };
+  bugbuddy = {
+    name = "bug-buddy-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/bug-buddy-2.26.0.tar.bz2;
+      md5 = "f92663a1a819f83e3eb3004f9e8a687a";
+    };
+  };
+  cheese = {
+    name = "cheese-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/cheese-2.26.0.tar.bz2;
+      md5 = "17c991c695c3a7549da6e42d1b327d79";
+    };
+  };
+  dasher = {
+    name = "dasher-4.10.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/dasher-4.10.0.tar.bz2;
+      md5 = "d07fa31c3a8ead147f981efa90193c56";
+    };
+  };
+  deskbarapplet = {
+    name = "deskbar-applet-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/deskbar-applet-2.26.0.tar.bz2;
+      md5 = "168044d1312bf30e71f2ed587d2bffb6";
+    };
+  };
+  ekiga = {
+    name = "ekiga-3.2.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/ekiga-3.2.0.tar.bz2;
+      md5 = "01c4c944a1b900b5b3bfa95d3a820b22";
+    };
+  };
+  empathy = {
+    name = "empathy-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/empathy-2.26.0.tar.bz2;
+      md5 = "f5b2d8ca7bd5e315491e3d05a7fd03c1";
+    };
+  };
+  eog = {
+    name = "eog-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/eog-2.26.0.tar.bz2;
+      md5 = "5d513046f80bc989e715243d8cee2825";
+    };
+  };
+  epiphany = {
+    name = "epiphany-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/epiphany-2.26.0.tar.bz2;
+      md5 = "98043cd7332fd3025e9b69f65904e5a4";
+    };
+  };
+  evince = {
+    name = "evince-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evince-2.26.0.tar.bz2;
+      md5 = "11c440e48702231e40066a78aae56f84";
+    };
+  };
+  evolution = {
+    name = "evolution-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-2.26.0.tar.bz2;
+      md5 = "97234b1ecded0232a1b68d2fc03b0252";
+    };
+  };
+  evolutiondataserver = {
+    name = "evolution-data-server-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-data-server-2.26.0.tar.bz2;
+      md5 = "d010845a4ee9604f050403b106c2f416";
+    };
+  };
+  evolutionexchange = {
+    name = "evolution-exchange-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-exchange-2.26.0.tar.bz2;
+      md5 = "845f0a74e4565a6639f3b8adb736cbc1";
+    };
+  };
+  evolutionmapi = {
+    name = "evolution-mapi-0.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-mapi-0.26.0.tar.bz2;
+      md5 = "b0f27b8deda6945356da035e28537d1a";
+    };
+  };
+  evolutionwebcal = {
+    name = "evolution-webcal-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-webcal-2.26.0.tar.bz2;
+      md5 = "a36036a94dd043f57a6d84ab9b6c732c";
+    };
+  };
+  fileroller = {
+    name = "file-roller-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/file-roller-2.26.0.tar.bz2;
+      md5 = "795c6b0a2b3b02c5f407b1d9f9b643ef";
+    };
+  };
+  gcalctool = {
+    name = "gcalctool-5.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gcalctool-5.26.0.tar.bz2;
+      md5 = "c2162ac18e9c1dae145cb79e677023c5";
+    };
+  };
+  gconfeditor = {
+    name = "gconf-editor-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gconf-editor-2.26.0.tar.bz2;
+      md5 = "2dc76415b22d805cfacfcd5fb98f185c";
+    };
+  };
+  gdm = {
+    name = "gdm-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gdm-2.26.0.tar.bz2;
+      md5 = "b1a8db2f0e058d3c7b4c9a4600839a14";
+    };
+  };
+  gedit = {
+    name = "gedit-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gedit-2.26.0.tar.bz2;
+      md5 = "577b30e6f17f6dce0af7be3e522d6058";
+    };
+  };
+  gnomeapplets = {
+    name = "gnome-applets-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-applets-2.26.0.tar.bz2;
+      md5 = "eed64366b0a1f4032506ac7221ce898a";
+    };
+  };
+  gnomebackgrounds = {
+    name = "gnome-backgrounds-2.24.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-backgrounds-2.24.1.tar.bz2;
+      md5 = "28e09fcdeef5616bc612b36e5068e413";
+    };
+  };
+  gnomecontrolcenter = {
+    name = "gnome-control-center-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-control-center-2.26.0.tar.bz2;
+      md5 = "eed8feccc37712e34d88bd3b20e46962";
+    };
+  };
+  gnomedesktop = {
+    name = "gnome-desktop-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-2.26.0.tar.bz2;
+      md5 = "796fc830e0baff24381809a7abe012f8";
+    };
+  };
+  gnomedesktopsharp = {
+    name = "gnome-desktop-sharp-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-sharp-2.26.0.tar.bz2;
+      md5 = "4bc990900bb318b2ba0b0e7998bb47d1";
+    };
+  };
+  gnomedocutils = {
+    name = "gnome-doc-utils-0.16.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-doc-utils-0.16.0.tar.bz2;
+      md5 = "45971197fd48147ee928462d5b74f234";
+    };
+  };
+  gnomegames = {
+    name = "gnome-games-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-games-2.26.0.tar.bz2;
+      md5 = "77e03e0caa57daec39e7cf8e09c87598";
+    };
+  };
+  gnomeicontheme = {
+    name = "gnome-icon-theme-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-icon-theme-2.26.0.tar.bz2;
+      md5 = "36a4e5e1b2c7c053779a9a399f6146a2";
+    };
+  };
+  gnomekeyring = {
+    name = "gnome-keyring-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-keyring-2.26.0.tar.bz2;
+      md5 = "0395fcf79b990465030a2795dcddacb9";
+    };
+  };
+  gnomemag = {
+    name = "gnome-mag-0.15.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-mag-0.15.5.tar.bz2;
+      md5 = "8d380056b90619f2e0b86e785836fbc4";
+    };
+  };
+  gnomemedia = {
+    name = "gnome-media-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-media-2.26.0.tar.bz2;
+      md5 = "3d519bc7d812aed8f6e4288b6d3cdf26";
+    };
+  };
+  gnomemenus = {
+    name = "gnome-menus-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-menus-2.26.0.tar.bz2;
+      md5 = "55fd07e67d8334de2e03e4e23c011452";
+    };
+  };
+  gnomenetstatus = {
+    name = "gnome-netstatus-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-netstatus-2.26.0.tar.bz2;
+      md5 = "f116157535ec185f0ea7503fafc5edd6";
+    };
+  };
+  gnomenettool = {
+    name = "gnome-nettool-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-nettool-2.26.0.tar.bz2;
+      md5 = "34bc06209bb72bd85d45829eecc078cb";
+    };
+  };
+  gnomepanel = {
+    name = "gnome-panel-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-panel-2.26.0.tar.bz2;
+      md5 = "27965de9b12952b22b7e232af6acb0de";
+    };
+  };
+  gnomepowermanager = {
+    name = "gnome-power-manager-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-power-manager-2.26.0.tar.bz2;
+      md5 = "a3d8815e143323083870f75e71fa1098";
+    };
+  };
+  gnomepythondesktop = {
+    name = "gnome-python-desktop-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-python-desktop-2.26.0.tar.bz2;
+      md5 = "fbcf4ef5ec4a8c4eec4d390c5889c80f";
+    };
+  };
+  gnomescreensaver = {
+    name = "gnome-screensaver-2.25.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-screensaver-2.25.2.tar.bz2;
+      md5 = "e0aa87be6034e0274103f0ef30c1d31d";
+    };
+  };
+  gnomesession = {
+    name = "gnome-session-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-session-2.26.0.tar.bz2;
+      md5 = "e17dbce7446b3e42fac2b1cea7dedffd";
+    };
+  };
+  gnomesettingsdaemon = {
+    name = "gnome-settings-daemon-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-settings-daemon-2.26.0.tar.bz2;
+      md5 = "c3a2934deccfcf13de15507d4be802d3";
+    };
+  };
+  gnomesharp = {
+    name = "gnome-sharp-2.24.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-sharp-2.24.1.tar.bz2;
+      md5 = "408f83f790a5189bcf76ea9299bc6410";
+    };
+  };
+  gnomespeech = {
+    name = "gnome-speech-0.4.25";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-speech-0.4.25.tar.bz2;
+      md5 = "89cbc23fc131c33396c0346085759f63";
+    };
+  };
+  gnomesystemmonitor = {
+    name = "gnome-system-monitor-2.26.0.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-monitor-2.26.0.1.tar.bz2;
+      md5 = "553de9c4912f4af25f92a3380626c0f1";
+    };
+  };
+  gnomesystemtools = {
+    name = "gnome-system-tools-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-tools-2.22.2.tar.bz2;
+      md5 = "c2c9a2570dd01a38b46a6adb91a2cb2f";
+    };
+  };
+  gnometerminal = {
+    name = "gnome-terminal-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-terminal-2.26.0.tar.bz2;
+      md5 = "013e51a2c4dd7dde5db49587952065ae";
+    };
+  };
+  gnomethemes = {
+    name = "gnome-themes-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-themes-2.26.0.tar.bz2;
+      md5 = "3f841154544867585504153d57df1fda";
+    };
+  };
+  gnomeuserdocs = {
+    name = "gnome-user-docs-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-docs-2.26.0.tar.bz2;
+      md5 = "3735096cf4b076696ebed217bf600190";
+    };
+  };
+  gnomeusershare = {
+    name = "gnome-user-share-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-share-2.26.0.tar.bz2;
+      md5 = "c99133b74a81a78ac0e4e10ef73fada7";
+    };
+  };
+  gnomeutils = {
+    name = "gnome-utils-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-utils-2.26.0.tar.bz2;
+      md5 = "667400cfb9bee954028024ac3cf91a09";
+    };
+  };
+  gok = {
+    name = "gok-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gok-2.26.0.tar.bz2;
+      md5 = "8cc28ad6010a977c9ccbe8d5b690f636";
+    };
+  };
+  gstpluginsbase = {
+    name = "gst-plugins-base-0.10.22";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-base-0.10.22.tar.bz2;
+      md5 = "5d0f1e07f8f6db564971b50f75261e8a";
+    };
+  };
+  gstpluginsgood = {
+    name = "gst-plugins-good-0.10.14";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-good-0.10.14.tar.bz2;
+      md5 = "a861ccbb90a176d1242608502f45f0ac";
+    };
+  };
+  gstreamer = {
+    name = "gstreamer-0.10.22";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gstreamer-0.10.22.tar.bz2;
+      md5 = "35dd8598837af4074753afe5b59e8ef2";
+    };
+  };
+  gtkengines = {
+    name = "gtk-engines-2.18.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtk-engines-2.18.0.tar.bz2;
+      md5 = "6a7ac01fc9f9429bfb126e068e74eb4f";
+    };
+  };
+  gtkhtml = {
+    name = "gtkhtml-3.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtkhtml-3.26.0.tar.bz2;
+      md5 = "75d3b6dcd939c2ddcad8aa255ab76f90";
+    };
+  };
+  gtksourceview = {
+    name = "gtksourceview-2.6.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtksourceview-2.6.0.tar.bz2;
+      md5 = "dd065ab2e96e51aade949249c5556439";
+    };
+  };
+  gucharmap = {
+    name = "gucharmap-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gucharmap-2.26.0.tar.bz2;
+      md5 = "c4384767bd11f43ef997bda7d77600a4";
+    };
+  };
+  gvfs = {
+    name = "gvfs-1.2.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gvfs-1.2.0.tar.bz2;
+      md5 = "d30aa7b099e4a3746da81265d27363da";
+    };
+  };
+  hamsterapplet = {
+    name = "hamster-applet-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/hamster-applet-2.26.0.tar.bz2;
+      md5 = "4e2e5853b1101fa98e69c231a2378ae5";
+    };
+  };
+  libgailgnome = {
+    name = "libgail-gnome-1.20.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgail-gnome-1.20.1.tar.bz2;
+      md5 = "5c5b71af5a8ab2a9403bdae52b20e46c";
+    };
+  };
+  libgnomekbd = {
+    name = "libgnomekbd-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomekbd-2.26.0.tar.bz2;
+      md5 = "aee58c088c4fd980e1bf813ea813c156";
+    };
+  };
+  libgnomeprint = {
+    name = "libgnomeprint-2.18.6";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprint-2.18.6.tar.bz2;
+      md5 = "a5aa248058a07de4b3cf444673cfc683";
+    };
+  };
+  libgnomeprintui = {
+    name = "libgnomeprintui-2.18.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprintui-2.18.4.tar.bz2;
+      md5 = "e76d763f6279b900a63e5fb2909f8810";
+    };
+  };
+  libgtop = {
+    name = "libgtop-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgtop-2.26.0.tar.bz2;
+      md5 = "a51ff49eddcce4573f7385e4be33158a";
+    };
+  };
+  libgweather = {
+    name = "libgweather-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgweather-2.26.0.tar.bz2;
+      md5 = "b96016d7b35c66cf251189e9851ee252";
+    };
+  };
+  liboobs = {
+    name = "liboobs-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/liboobs-2.22.0.tar.bz2;
+      md5 = "1b090ecd6c0df58b131795ff9a5c9057";
+    };
+  };
+  librsvg = {
+    name = "librsvg-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/librsvg-2.26.0.tar.bz2;
+      md5 = "65dbd726a514fe8b797d26254b8efc1e";
+    };
+  };
+  libsoup = {
+    name = "libsoup-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libsoup-2.26.0.tar.bz2;
+      md5 = "9df9d2b3304213641d3214a774d75ee1";
+    };
+  };
+  libwnck = {
+    name = "libwnck-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libwnck-2.26.0.tar.bz2;
+      md5 = "73873bf666fc18dff04d66c48400b0c5";
+    };
+  };
+  metacity = {
+    name = "metacity-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/metacity-2.26.0.tar.bz2;
+      md5 = "eafb624e79fbcdab6da59acc222430b1";
+    };
+  };
+  mousetweaks = {
+    name = "mousetweaks-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/mousetweaks-2.26.0.tar.bz2;
+      md5 = "f63556d0db84287118b34e4a1e7421f1";
+    };
+  };
+  nautilus = {
+    name = "nautilus-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/nautilus-2.26.0.tar.bz2;
+      md5 = "d26e673de34be4c6d8ab09af89b92270";
+    };
+  };
+  orca = {
+    name = "orca-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/orca-2.26.0.tar.bz2;
+      md5 = "d097f28747943a32d50e3b91eab5c518";
+    };
+  };
+  pygtksourceview = {
+    name = "pygtksourceview-2.5.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/pygtksourceview-2.5.0.tar.bz2;
+      md5 = "e3d66310ce16bb138e216982ef6697ee";
+    };
+  };
+  seahorse = {
+    name = "seahorse-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-2.26.0.tar.bz2;
+      md5 = "ddecca2181d4c9f0dfbe412b68508e5d";
+    };
+  };
+  seahorseplugins = {
+    name = "seahorse-plugins-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-plugins-2.26.0.tar.bz2;
+      md5 = "8936feb29cf9e4b935d1059ee4e416c6";
+    };
+  };
+  soundjuicer = {
+    name = "sound-juicer-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/sound-juicer-2.26.0.tar.bz2;
+      md5 = "6dd30f5a8119f9698eabd8220d5c5392";
+    };
+  };
+  swfdecgnome = {
+    name = "swfdec-gnome-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/swfdec-gnome-2.26.0.tar.bz2;
+      md5 = "53d611d9a76a06a703650c4b73fd44cc";
+    };
+  };
+  tomboy = {
+    name = "tomboy-0.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/tomboy-0.14.0.tar.bz2;
+      md5 = "75ab86e08d925c7ab74d88999e2121e7";
+    };
+  };
+  totem = {
+    name = "totem-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-2.26.0.tar.bz2;
+      md5 = "c4204177970911e46b555dd317c37611";
+    };
+  };
+  totemplparser = {
+    name = "totem-pl-parser-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-pl-parser-2.26.0.tar.bz2;
+      md5 = "2514b1035a5c8a418580b59e0dcec7ca";
+    };
+  };
+  vinagre = {
+    name = "vinagre-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vinagre-2.26.0.tar.bz2;
+      md5 = "6930bec2968c96dfb3407d6492ae42d4";
+    };
+  };
+  vino = {
+    name = "vino-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vino-2.26.0.tar.bz2;
+      md5 = "7a10464824d8446411b90c162d34401e";
+    };
+  };
+  vte = {
+    name = "vte-0.20.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vte-0.20.0.tar.bz2;
+      md5 = "12dde859bc98e039336baff6e9e6b15b";
+    };
+  };
+  yelp = {
+    name = "yelp-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/yelp-2.26.0.tar.bz2;
+      md5 = "3413fd051c5ecbfe98819a8fb4ac83dd";
+    };
+  };
+  zenity = {
+    name = "zenity-2.26.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/zenity-2.26.0.tar.bz2;
+      md5 = "6660ce6dac0a6ca495a0e954cb6b40a2";
+    };
+  };
+}
--- a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix
+++ b/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix
@ -1,179 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.12.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/atk-1.12.4.tar.bz2;
-      md5 = "0a2c6a7bbc380e3a3d94e9061f76a849";
-    };
-  };
-  atspi = {
-    name = "at-spi-1.7.12";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/at-spi-1.7.12.tar.bz2;
-      md5 = "ca4e69bb28c409e25bbc10293fa34941";
-    };
-  };
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.36";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/esound-0.2.36.tar.bz2;
-      md5 = "3facb5aa0115cc1c31771b9ad454ae76";
-    };
-  };
-  gail = {
-    name = "gail-1.9.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gail-1.9.3.tar.bz2;
-      md5 = "1e8825da60fd19833dfc6b2068f05ec9";
-    };
-  };
-  GConf = {
-    name = "GConf-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/GConf-2.14.0.tar.bz2;
-      md5 = "d07c2efcaf477cf34225c604a04b6271";
-    };
-  };
-  glib = {
-    name = "glib-2.12.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/glib-2.12.9.tar.bz2;
-      md5 = "b3f6a2a318610af6398b3445f1a2d6c6";
-    };
-  };
-  gnomemimedata = {
-    name = "gnome-mime-data-2.4.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-mime-data-2.4.3.tar.bz2;
-      md5 = "2abe573a6e84b71c58a661d4bafa9bd6";
-    };
-  };
-  gnomevfs = {
-    name = "gnome-vfs-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-2.16.3.tar.bz2;
-      md5 = "586d6fe3740385c000a864d5e2cf8215";
-    };
-  };
-  gnomevfsmonikers = {
-    name = "gnome-vfs-monikers-2.15.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
-      md5 = "b16f0db0482263be3318e269f52bb5b6";
-    };
-  };
-  gtk = {
-    name = "gtk+-2.10.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk+-2.10.9.tar.bz2;
-      md5 = "20d763198efb38263b22dee347f69da6";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk-doc-1.7.tar.bz2;
-      md5 = "2543a3f5a7b5347fb135855ca55adea1";
-    };
-  };
-  intltool = {
-    name = "intltool-0.35.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/intltool-0.35.0.tar.bz2;
-      md5 = "95c4bd2a91419083ee880a3f53f86edf";
-    };
-  };
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.17";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libart_lgpl-2.3.17.tar.bz2;
-      md5 = "dfca42529393c8a8f59dc4dc10675a46";
-    };
-  };
-  libbonobo = {
-    name = "libbonobo-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonobo-2.16.0.tar.bz2;
-      md5 = "30cdcf2b5316888f10fea6362b38499c";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonoboui-2.16.0.tar.bz2;
-      md5 = "603ffc92491ef27ccfbc2b69abd3906b";
-    };
-  };
-  libglade = {
-    name = "libglade-2.6.2";
-    src = fetchurl {
-      url = http://ftp.acc.umu.se/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2;
-      md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnome-2.16.0.tar.bz2;
-      md5 = "b3f030f6c677b0e1bcfca7c7e58d6c4a";
-    };
-  };
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomecanvas-2.14.0.tar.bz2;
-      md5 = "516c46fb4a1401b05cfef58c350fbd3d";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomeui-2.16.1.tar.bz2;
-      md5 = "d9b975952bf5feee8818d3fb18cca0b3";
-    };
-  };
-  libIDL = {
-    name = "libIDL-0.8.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libIDL-0.8.7.tar.bz2;
-      md5 = "53a3874beb42ddfd9a5030047a0db740";
-    };
-  };
-  libxml2 = {
-    name = "libxml2-2.6.27";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxml2-2.6.27.tar.bz2;
-      md5 = "3617f7dc07534025a4898f2b62fb46df";
-    };
-  };
-  libxslt = {
-    name = "libxslt-1.1.20";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxslt-1.1.20.tar.bz2;
-      md5 = "aa0b4817c38104d9a724ee12b81e286e";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.14.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/ORBit2-2.14.5.tar.bz2;
-      md5 = "5b3ca3d7ed13a76c9e7bb4a890fe68af";
-    };
-  };
-  pango = {
-    name = "pango-1.14.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/pango-1.14.10.tar.bz2;
-      md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06";
-    };
-  };
-}
--- a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
+++ b/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
@ -1,165 +0,0 @@
-# Note: this file was generated automatically by make-listing.pl!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/atk-1.22.0.tar.bz2;
-      md5 = "06a2b39a22d5ca35c47435da6b9643ac";
-    };
-  };
-  atspi = {
-    name = "at-spi-1.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/at-spi-1.22.1.tar.bz2;
-      md5 = "2ee1b35ef25e753e6bac840a418608f5";
-    };
-  };
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.38";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/esound-0.2.38.tar.bz2;
-      md5 = "1c48c100b450d617b58dacb59837d34f";
-    };
-  };
-  gail = {
-    name = "gail-1.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gail-1.22.1.tar.bz2;
-      md5 = "521e2e1ae1dfe4699c037b1be205b0b3";
-    };
-  };
-  GConf = {
-    name = "GConf-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/GConf-2.22.0.tar.bz2;
-      md5 = "a56c043afeb1052abaf45407409b0331";
-    };
-  };
-  glib = {
-    name = "glib-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/glib-2.16.3.tar.bz2;
-      md5 = "195f9a803cc5279dbb39afdf985f44cb";
-    };
-  };
-  gnomemimedata = {
-    name = "gnome-mime-data-2.18.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-mime-data-2.18.0.tar.bz2;
-      md5 = "541858188f80090d12a33b5a7c34d42c";
-    };
-  };
-  gnomevfs = {
-    name = "gnome-vfs-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-2.22.0.tar.bz2;
-      md5 = "369105fd82cb99e69e63acab8f3b89b7";
-    };
-  };
-  gnomevfsmonikers = {
-    name = "gnome-vfs-monikers-2.15.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
-      md5 = "b16f0db0482263be3318e269f52bb5b6";
-    };
-  };
-  gtk = {
-    name = "gtk+-2.12.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk+-2.12.9.tar.bz2;
-      md5 = "33499772fdc3bea569c6d5673e5831b4";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk-doc-1.9.tar.bz2;
-      md5 = "bcd002f381385812737a05538eb8b21e";
-    };
-  };
-  intltool = {
-    name = "intltool-0.37.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/intltool-0.37.1.tar.bz2;
-      md5 = "860d392f04299c2740d0752501639c3b";
-    };
-  };
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.20";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libart_lgpl-2.3.20.tar.bz2;
-      md5 = "d0ce67f2ebcef1e51a83136c69242a73";
-    };
-  };
-  libbonobo = {
-    name = "libbonobo-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonobo-2.22.0.tar.bz2;
-      md5 = "998a576ad26784ac87eab99e96013527";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonoboui-2.22.0.tar.bz2;
-      md5 = "e4e4d74c9387d08c956574f981cf91f2";
-    };
-  };
-  libglade = {
-    name = "libglade-2.6.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libglade-2.6.2.tar.bz2;
-      md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.22.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnome-2.22.0.tar.bz2;
-      md5 = "52db42762589826c66d27def66112807";
-    };
-  };
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.20.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomecanvas-2.20.1.1.tar.bz2;
-      md5 = "948ed771d2957d24a0c9a414e9581055";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.22.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomeui-2.22.1.tar.bz2;
-      md5 = "5a60405f006e873ba7bc97ec9c8e4c5d";
-    };
-  };
-  libIDL = {
-    name = "libIDL-0.8.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libIDL-0.8.10.tar.bz2;
-      md5 = "9e10a77ff225587e59c0a28c66b4faa7";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.14.12";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/ORBit2-2.14.12.tar.bz2;
-      md5 = "6f4bf7d803d442e9d093a0daa203d506";
-    };
-  };
-  pango = {
-    name = "pango-1.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/pango-1.20.1.tar.bz2;
-      md5 = "376e6d94686b888fb70f24d191b84f82";
-    };
-  };
-}
--- a/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix
+++ b/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix
@ -0,0 +1,151 @@
+# Note: this file was generated automatically by make-listing.pl!
+
+{fetchurl} : {
+  atk = {
+    name = "atk-1.26.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/atk-1.26.0.tar.bz2;
+      md5 = "719229408019c548855673840679f156";
+    };
+  };
+  atspi = {
+    name = "at-spi-1.26.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/at-spi-1.26.0.tar.bz2;
+      md5 = "3f2f7d29b45eff08adf56af0d31d3984";
+    };
+  };
+  audiofile = {
+    name = "audiofile-0.2.6";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/audiofile-0.2.6.tar.bz2;
+      md5 = "3d01302834660850b6141cac1e6f5501";
+    };
+  };
+  esound = {
+    name = "esound-0.2.41";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/esound-0.2.41.tar.bz2;
+      md5 = "8d9aad3d94d15e0d59ba9dc0ea990c6c";
+    };
+  };
+  GConf = {
+    name = "GConf-2.26.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/GConf-2.26.0.tar.bz2;
+      md5 = "b010f0de356ea093c6a73778b13de956";
+    };
+  };
+  glib = {
+    name = "glib-2.20.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/glib-2.20.0.tar.bz2;
+      md5 = "05188e560dbd8bddd568e24ce10dd003";
+    };
+  };
+  gnomemimedata = {
+    name = "gnome-mime-data-2.18.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-mime-data-2.18.0.tar.bz2;
+      md5 = "541858188f80090d12a33b5a7c34d42c";
+    };
+  };
+  gnomevfs = {
+    name = "gnome-vfs-2.24.1";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-2.24.1.tar.bz2;
+      md5 = "100f9af16dc659e375ee8da45175a28d";
+    };
+  };
+  gnomevfsmonikers = {
+    name = "gnome-vfs-monikers-2.15.3";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
+      md5 = "b16f0db0482263be3318e269f52bb5b6";
+    };
+  };
+  gtk = {
+    name = "gtk+-2.16.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk+-2.16.0.tar.bz2;
+      md5 = "139528802794287427fd4d18875b5cf5";
+    };
+  };
+  gtkdoc = {
+    name = "gtk-doc-1.11";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk-doc-1.11.tar.bz2;
+      md5 = "b5e268c71fa90aad890cf53715664d0a";
+    };
+  };
+  libart_lgpl = {
+    name = "libart_lgpl-2.3.20";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libart_lgpl-2.3.20.tar.bz2;
+      md5 = "d0ce67f2ebcef1e51a83136c69242a73";
+    };
+  };
+  libbonobo = {
+    name = "libbonobo-2.24.1";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonobo-2.24.1.tar.bz2;
+      md5 = "8868b6083392964a6969547ceb8d7cd1";
+    };
+  };
+  libbonoboui = {
+    name = "libbonoboui-2.24.1";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonoboui-2.24.1.tar.bz2;
+      md5 = "9ff3ec1c7aefd0b1a15a5b21ecc7b4e4";
+    };
+  };
+  libglade = {
+    name = "libglade-2.6.4";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libglade-2.6.4.tar.bz2;
+      md5 = "d1776b40f4e166b5e9c107f1c8fe4139";
+    };
+  };
+  libgnome = {
+    name = "libgnome-2.26.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnome-2.26.0.tar.bz2;
+      md5 = "a5634fe9ddc54bbb726cbaaa35abc0b9";
+    };
+  };
+  libgnomecanvas = {
+    name = "libgnomecanvas-2.26.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomecanvas-2.26.0.tar.bz2;
+      md5 = "9bbc635e5ae70e63af071af74ba7e72f";
+    };
+  };
+  libgnomeui = {
+    name = "libgnomeui-2.24.1";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomeui-2.24.1.tar.bz2;
+      md5 = "8e7d36dd1decfcf5cc4d5cb93bc4d217";
+    };
+  };
+  libIDL = {
+    name = "libIDL-0.8.13";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libIDL-0.8.13.tar.bz2;
+      md5 = "b43b289a859eb38a710f70622c46e571";
+    };
+  };
+  ORBit2 = {
+    name = "ORBit2-2.14.17";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/ORBit2-2.14.17.tar.bz2;
+      md5 = "10bfb957fa4a8935a0b4afaee7d71df7";
+    };
+  };
+  pango = {
+    name = "pango-1.24.0";
+    src = fetchurl {
+      url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/pango-1.24.0.tar.bz2;
+      md5 = "d209f41079833cd2ef2c5e580ab9c5ee";
+    };
+  };
+}
--- a/pkgs/desktops/gnome/vte.nix
+++ b/pkgs/desktops/gnome/vte.nix
@ -1,13 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, ncurses, python, gettext
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext
-  ];
-  
-  propagatedBuildInputs = [ncurses];
-}
--- a/pkgs/desktops/kde-3/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@ -13,6 +13,12 @@ stdenv.mkDerivation {
    sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
  };

+  patches = [
+    # We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
+    # Adapted from Gentoo.
+    ./inotify.patch
+  ];
+
  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
  
  buildInputs = [
--- a/pkgs/desktops/kde-3/kdelibs/inotify.patch
+++ b/pkgs/desktops/kde-3/kdelibs/inotify.patch
@ -0,0 +1,30 @@
+diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
+*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
+--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp	2009-04-01 13:26:48.000000000 +0200
+***************
+*** 64,74 ****
+  // debug
+  #include <sys/ioctl.h>
+  
+! #ifdef HAVE_INOTIFY
+  #include <unistd.h>
+  #include <fcntl.h>
+  #include <sys/syscall.h>
+- #include <linux/types.h>
+  // Linux kernel headers are documented to not compile
+  #define _S390_BITOPS_H
+  #include <linux/inotify.h>
+--- 64,76 ----
+  // debug
+  #include <sys/ioctl.h>
+  
+! #if 1
+! #include <sys/inotify.h>
+! #include <fcntl.h>
+! #elif HAVE_INOTIFY
+  #include <unistd.h>
+  #include <fcntl.h>
+  #include <sys/syscall.h>
+  // Linux kernel headers are documented to not compile
+  #define _S390_BITOPS_H
+  #include <linux/inotify.h>
--- a/pkgs/desktops/kde-4.2/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.2/support/strigi/default.nix
@ -1,13 +1,23 @@
-{stdenv, fetchurl, cmake, perl,
-bzip2, qt4, libxml2, exiv2, fam, log4cxx, cluceneCore}:
+{ stdenv, fetchurl, cmake, perl, bzip2, qt4, libxml2, exiv2, fam
+, log4cxx, cluceneCore
+}:

 stdenv.mkDerivation {
  name = "strigi-0.6.4";
+  
  src = fetchurl {
    url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2;
    md5 = "324fd9606ac77765501717ff92c04f9a";
  };
-  CLUCENE_HOME=cluceneCore;
-  buildInputs = [ cmake perl
-                  bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam log4cxx cluceneCore ];
+  
+  CLUCENE_HOME = cluceneCore;
+  
+  buildInputs = [
+    cmake perl bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam /* log4cxx */ cluceneCore
+  ];
+
+  meta = {
+    homepage = http://strigi.sourceforge.net/;
+    description = "A very fast and efficient crawler to index data on your harddrive";
+  };
 }
--- a/pkgs/desktops/kde/kdebase/default.nix
+++ b/pkgs/desktops/kde/kdebase/default.nix
@ -0,0 +1,55 @@
+{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
+, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
+}:
+
+# Note: the glib dependency is needed for nspluginviewer.
+
+let version = "3.5.10"; in
+
+stdenv.mkDerivation {
+  name = "kdebase-${version}";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
+    sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp";
+  };
+
+  buildInputs = [
+    pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
+    fontconfig pam hal dbus glib
+    xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
+    xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
+    xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
+    xlibs.scrnsaverproto xlibs.libXScrnSaver
+    xlibs.libXcomposite xlibs.libXfixes
+  ];
+
+  configureFlags = ''
+    --without-arts 
+    --with-ssl-dir=${openssl}
+    --with-extra-includes=${libjpeg}/include
+  '';
+
+  # Prevent configure from looking for pkg-config and freetype-config
+  # in the wrong location (it looks in /usr/bin etc. *before* looking
+  # in $PATH).
+  preConfigure = ''
+    substituteInPlace configure \
+      --replace /usr/bin /no-such-path \
+      --replace /usr/local/bin /no-such-path \
+      --replace /opt/local/bin /no-such-path
+  '';
+
+  # Quick hack to work around a faulty dependency in
+  # konqueror/keditbookmarks/Makefile.am (${includedir} should be
+  # ${kdelibs} or so).
+  preBuild = ''
+    ensureDir $out/include
+    ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/
+  '';
+  
+  postInstall = "rm $out/include/kbookmarknotifier.h";
+
+  # Work around some inexplicable build failure starting in kdebase 3.5.9.
+  LDFLAGS = "-L${kdelibs}/lib";
+}
--- a/pkgs/desktops/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde/kdelibs/default.nix
@ -0,0 +1,43 @@
+{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
+, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, freetype, bzip2, cups, attr, acl
+}:
+
+let version = "3.5.10"; in
+
+stdenv.mkDerivation {
+  name = "kdelibs-${version}";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
+    sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
+  };
+
+  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
+  
+  buildInputs = [
+    zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    libxslt expat libtool freetype bzip2 cups
+    xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
+  ];
+
+  propagatedBuildInputs = [attr acl];
+
+  # Prevent configure from looking for pkg-config and freetype-config
+  # in the wrong location (it looks in /usr/bin etc. *before* looking
+  # in $PATH).
+  preConfigure = ''
+    substituteInPlace configure \
+      --replace /usr/bin /no-such-path \
+      --replace /usr/local/bin /no-such-path \
+      --replace /opt/local/bin /no-such-path
+  '';
+
+  configureFlags = ''
+    --without-arts 
+    --with-ssl-dir=${openssl}
+    --with-extra-includes=${libjpeg}/include
+    --x-includes=${xlibs.libX11}/include
+    --x-libraries=${xlibs.libX11}/lib
+  '';
+}
--- a/pkgs/desktops/superkaramba/builder.sh
+++ b/pkgs/desktops/superkaramba/builder.sh
@ -3,7 +3,6 @@ source $stdenv/setup
 echo $xlibs2
 echo $x_libraries_env

-postConfigure=postConfigure
 postConfigure() {
  pwd;
  ls -l super*/src/Makefile;
--- a/pkgs/development/compilers/gcc-2.95/builder.sh
+++ b/pkgs/development/compilers/gcc-2.95/builder.sh
@ -47,7 +47,6 @@ else
 fi


-preConfigure=preConfigure
 preConfigure() {
    
    # Determine the frontends to build.
--- a/pkgs/development/compilers/gcc-3.3/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
@ -26,7 +26,7 @@ EOF
    if test -n "$langCC"; then
        langs="$langs,c++"
    fi
-    if test -n "$langF77"; then
+    if test -n "$langFortran"; then
        langs="$langs,f77"
    fi

@ -38,8 +38,6 @@ EOF
    configureFlags="--enable-languages=$langs"
 }

-preConfigure=preConfigure
-

 postConfigure() {
    if test "$noSysDirs" = "1"; then
@ -82,8 +80,6 @@ postConfigure() {
    fi
 }

-postConfigure=postConfigure
-

 buildFlags="bootstrap"

--- a/pkgs/development/compilers/gcc-3.3/default.nix
+++ b/pkgs/development/compilers/gcc-3.3/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langF77 ? false
+, langC ? true, langCC ? true, langFortran ? false
 }:

 assert langC;
@ -8,10 +8,19 @@ assert langC;

 stdenv.mkDerivation {
  name = "gcc-3.3.6";
+  
  builder = ./builder.sh;
+  
  src = fetchurl {
    url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
    md5 = "6936616a967da5a0b46f1e7424a06414";
  };
-  inherit noSysDirs langC langCC langF77;
+  
+  inherit noSysDirs langC langCC langFortran;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 3.3.x";
+  };
 }
--- a/Show more
+++ b/Show more