* stdenv-nix-linux should more-or-less work again now.

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

build/aterm-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src
-cd aterm-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf aterm-*

build/atk-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf atk-* || exit 1

build/glib-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfj $src
-cd glib-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf glib-*

build/gnet-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gnet-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gnet-* || exit 1

build/gtk+-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtk+-* || exit 1

build/gtkspell-build.sh

@@ -1,15 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib
-export C_INCLUDE_PATH=$pspell/include
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gtkspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtkspell-* || exit 1

build/httpd-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$top --enable-ssl --with-ssl=$ssl --enable-mods-shared=all || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf httpd-* || exit 1

build/openssl-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd openssl-* || exit 1
-./config --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf openssl-* || exit 1

build/pan-build-2.sh

@@ -1,20 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-# A bug in gtkspell: the pspell library path is not exported
-# through pkgconfig.
-export LIBRARY_PATH=$pspell/lib
-
-export LDFLAGS=-s
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd pan-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pan-* || exit 1

build/pan-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
-
-top=`pwd`
-tar xvfj $src
-cd pan-*
-./configure --prefix=$top
-make
-make install

build/pan-run.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-ldd $pan/bin/pan
-
-prog=$1
-shift
-
-$pan/bin/$prog $*

build/pango-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd pango-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pango-* || exit 1

build/pkgconfig-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pkgconfig-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd .. || exit 1
-rm -rf pkgconfig-* || exit 1

build/pspell-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pspell-* || exit 1

build/subversion-build.sh

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-export LDFLAGS=-s
-
-top=`pwd`
-
-if test $httpsClient; then
-    extraflags="--with-ssl --with-libs=$ssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extrainst="APACHE_LIBEXECDIR=$top/modules $extrainst"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$top $extraflags || exit 1
-make || exit 1
-make install $extrainst || exit 1
-cd $top || exit 1
-rm -rf subversion-* || exit 1

fixdescriptors/aterm-2.0.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "aterm-2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("createGCC", True)
-
-  , Bind("src", Url("853474e4bcf4a85f7d38a0676b36bded", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz"))
-  , Bind("build", Local("../build/aterm-build.sh"))
-  ]
-)

fixdescriptors/atk-1.2.0.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "atk-1.2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("06a84758129554ae044af8865ecb6f1c", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2"))
-  , Bind("build", Local("../build/atk-build.sh"))
-  ]
-)

fixdescriptors/glib-2.2.1.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "glib-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-
-  , Bind("src", Url("42406a17819080326e105f8333963b97", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/glib-build.sh"))
-  ]
-)

fixdescriptors/gnet-1.1.8.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gnet-1.1.8")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("da2b5de278e96a5b907c2e2304bf6542", "http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz"))
-  , Bind("build", Local("../build/gnet-build.sh"))
-  ]
-)

fixdescriptors/gtk+-2.2.1.fix

@@ -1,13 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtk+-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-
-  , Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/gtk+-build.sh"))
-  ]
-)

fixdescriptors/gtkspell-2.0.2.fix

@@ -1,15 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtkspell-2.0.2")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-
-  , Bind("src", Url("385daba9bebfdc7fdbdf524e07deb920", "http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz"))
-  , Bind("build", Local("../build/gtkspell-build.sh"))
-  ]
-)

fixdescriptors/httpd-2.0.45.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "httpd-2.0.45")
-  , Bind("releaseId", "1")
-
-  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
-
-  , Bind("src", Url("1f33e9a2e2de06da190230fa72738d75", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz"))
-  , Bind("build", Local("../build/httpd-build.sh"))
-  ]
-)

fixdescriptors/openssl-0.9.7b.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "openssl-0.9.7b")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("fae4bec090fa78e20f09d76d55b6ccff", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz"))
-  , Bind("build", Local("../build/openssl-build.sh"))
-  ]
-)

fixdescriptors/pan-0.14.0.fix

@@ -1,17 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pan-0.14.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("gnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-  , Bind("gtkspell", Fix("./gtkspell-2.0.2.fix"))
-
-  , Bind("src", Url("b2702adadb84c2e0d52d2bb029c05206", "http://pan.rebelbase.com/download/releases/0.14.0/SOURCE/pan-0.14.0.tar.bz2"))
-  , Bind("build", Local("../build/pan-build-2.sh"))
-  ]
-)

fixdescriptors/pango-1.2.1.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pango-1.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
-  , Bind("build", Local("../build/pango-build.sh"))
-  ]
-)

fixdescriptors/pkgconfig-0.15.0.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pkgconfig-0.15.0")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("a7e4f60a6657dbc434334deb594cc242", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz"))
-  , Bind("build", Local("../build/pkgconfig-build.sh"))
-  ]
-)

fixdescriptors/pspell-.12.2.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pspell-.12.2")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("cfd3816b2372932a1b71c0ce4e9f881e", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz"))
-  , Bind("build", Local("../build/pspell-build.sh"))
-  ]
-)

fixdescriptors/subversion-0.21.0.fix

@@ -1,16 +0,0 @@
-Descr(
-  [ Bind("pkgId", "subversion-0.21.0")
-  , Bind("releaseId", "1")
-
-  , Bind("httpsClient", Bool(True))
-  , Bind("httpServer", Bool(True))
-  , Bind("httpsServer", Bool(True))
-
-  , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
-
-  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
-
-  , Bind("src", Url("b2ad91127fb652e764b750f4c0002528", "http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz"))
-  , Bind("build", Local("../build/subversion-build.sh"))
-  ]
-)

fixdescriptors/system.fix

@@ -1,19 +0,0 @@
-Descr(
-  [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("3"))
-
-  , Bind("actATerm", Fix("./aterm-2.0.fix"))
-  , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("actGlib", Fix("./glib-2.2.1.fix"))
-  , Bind("actAtk", Fix("./atk-1.2.0.fix"))
-  , Bind("actPango", Fix("./pango-1.2.1.fix"))
-  , Bind("actGtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("actGnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("actPspell", Fix("./pspell-.12.2.fix"))
-  , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
-  , Bind("actPan", Fix("./pan-0.14.0.fix"))
-  , Bind("actSubversion", Fix("./subversion-0.21.0.fix"))
-
-  , Bind("build", Local("../../scripts/nix-populate"))
-  ]
-)

pkgs/README

@@ -0,0 +1,109 @@
+* Classification scheme for packages
+
+- many packages fall under several categories; what matters is the
+  *primary* purpose of a package.  For example, the libxml2 package
+  builds both a library and some tools; but it's a library foremost,
+  so it goes under ./development/libraries. 
+
+- when in doubt, refactor.
+
+IF it's used to support SOFTWARE DEVELOPMENT:
+
+  IF it's a LIBRARY used by other packages:
+    IF it's directly related to GTK:
+      ./development/libraries/gtk+
+    ELSE
+      ./development/libraries
+      (e.g., libxml2)
+  ELSE IF it's a COMPILER:
+    ./development/compilers
+    (e.g., gcc)
+  ELSE IF it's an INTERPRETER:
+    ./development/interpreters
+  ELSE IF it's a development TOOL (or set of):
+    IF it's a PARSER GENERATOR (incl. lexers):
+      ./development/tools/parsing
+      (e.g., bison, flex)
+    ELSE IF it's a BUILD MANAGER:
+      ./development/tools/build-managers
+      (e.g., gnumake
+    ELSE
+      ./development/tools/misc
+      (e.g., binutils)
+  ELSE
+    ./development/misc
+
+ELSE IF it's a TOOL (or set of):
+  # a tool is a relatively *small* program, esp. one intented to be
+  # used non-interactively
+
+  IF it's for NETWORKING:
+    ./tools/networking
+    (e.g., wget)
+  ELSE IF it's for TEXT PROCESSING:
+    ./tools/text
+    (e.g., diffutils)
+  ELSE IF it's a SYSTEM utility, i.e., something related or essential
+    to the operation of a system:
+    ./tools/system
+    (e.g., init)
+  ELSE IF it's an ARCHIVER (which may include a compression function):
+    ./tools/archivers
+    (e.g., zip, tar)
+  ELSE IF it's a COMPRESSION program:
+    ./tools/compression
+    (e.g., gzip, bzip2)
+  ELSE
+    ./tools/misc
+
+ELSE IF it's a SHELL:
+
+  ./shells
+
+ELSE IF it's a SERVER:
+
+  IF it's a HTTP server:
+    ./servers/http
+    (e.g., apache)
+  IF it's a X11 server:
+    ./servers/x11
+    (e.g., xfree86)
+  ELSE
+    ./servers/misc
+
+ELSE IF it's a DESKTOP ENVIRONMENT (incl. WINDOW MANAGERS):
+
+  ./desktops
+  (e.g., kde, gnome, fvwm)
+
+ELSE IF it's an APPLICATION:
+  # a (typically large) program with a distinct user interface,
+  # primarily used interactively
+
+  IF it's a VERSION MANAGEMENT system:
+    ./applications/version-management
+  ELSE IF it's for VIDEO playback/etc:
+    ./applications/video
+  ELSE IF it's for GRAPHICS viewing/editing/etc:
+    ./applications/graphics
+  ELSE IF it's for NETWORKING:
+    IF it's a MAILREADER:
+      ./applications/networking/mailreaders
+    IF it's a NEWSREADER:
+      ./applications/networking/newsreaders
+    ELSE
+      ./applications/networking/misc
+  ELSE
+    ./applications/misc
+
+ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics):
+
+  IF it's related to SGML/XML processing:
+    IF it's a XML DTD:
+      ./data/sgml+xml/schemas/xml-dtd
+    ELSE IF it's an XSLT stylesheet (okay, these are executable...):
+      ./data/sgml+xml/stylesheets/xslt
+
+ELSE:
+
+  ./misc

pkgs/VERSION

@@ -0,0 +1 @@
+0.5

pkgs/applications/editors/emacs/modes/nxml/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir -p $out/emacs/site-lisp || exit 1
+cd $out/emacs/site-lisp || exit 1
+tar xvfz $src || exit 1
+mv nxml-mode-*/* . || exit 1
+rmdir nxml-mode-*
+
+exit 0

pkgs/applications/editors/emacs/modes/nxml/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "nxml-mode-20031031";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.thaiopensource.com/download/nxml-mode-20031031.tar.gz;
+    md5 = "4cbc32047183e6cc1b7a2757d1078bd2";
+  };
+  stdenv = stdenv;
+}

pkgs/applications/graphics/gqview/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $libpng"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd gqview-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/graphics/gqview/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpng}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull libpng;
+# Note that we cannot just copy gtk's png attribute, since gtk might
+# not be linked against png.
+assert libpng == gtk.libpng;
+
+derivation {
+  name = "gqview-1.3.5";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.5.tar.gz;
+    md5 = "c44687bdd636ea6e5133fb936abf880a";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  libpng = libpng;
+}

pkgs/applications/misc/hello/builder.sh

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

pkgs/applications/misc/hello/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, perl}:
+
+derivation {
+  name = "hello-2.1.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
+    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+  };
+  stdenv = stdenv;
+  perl = perl;
+}

pkgs/applications/networking/browsers/firefox/builder.sh

@@ -0,0 +1,30 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd mozilla || exit 1
+
+cat > .mozconfig <<EOF
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+EOF
+echo "ac_add_options --prefix=$out" >> .mozconfig
+
+./configure || exit 1
+make -f client.mk build || exit 1
+make install || exit 1

pkgs/applications/networking/browsers/firefox/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
+}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull perl
+  && !isNull zip && !isNull libIDL;
+
+assert libIDL.glib == gtk.glib;
+
+derivation {
+  name = "firefox-0.8";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
+    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  perl = perl;
+  zip = zip;
+  libIDL = libIDL;
+}

pkgs/applications/networking/mailreaders/sylpheed/builder.sh

@@ -0,0 +1,20 @@
+#! /bin/sh
+
+buildinputs="$gtk $gdkpixbuf $openssl"
+. $stdenv/setup || exit 1
+
+if test $sslSupport; then
+    extraflags="--enable-ssl $extraflags"
+fi
+
+if test $imageSupport; then
+    extraflags="--enable-gdk-pixbuf $extraflags"
+else
+    extraflags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
+fi    
+
+tar xvfj $src || exit 1
+cd sylpheed-* || exit 1
+./configure --prefix=$out $extraflags || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/networking/mailreaders/sylpheed/default.nix

@@ -0,0 +1,27 @@
+{ sslSupport ? true
+, imageSupport ? true
+, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null
+}:
+
+assert !isNull gtk;
+assert sslSupport -> !isNull openssl;
+assert imageSupport -> !isNull gdkpixbuf;
+
+derivation {
+  name = "sylpheed-0.9.8a";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.8a.tar.bz2;
+    md5 = "6ac823f06d8fe4f265f37d9c96068e05";
+  };
+
+  sslSupport = sslSupport;
+  imageSupport = imageSupport;
+
+  stdenv = stdenv;
+  gtk = gtk;
+  openssl = if sslSupport then openssl else null;
+  gdkpixbuf = if imageSupport then gdkpixbuf else null;
+}

pkgs/applications/networking/newsreaders/pan/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd pan-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -0,0 +1,31 @@
+{ spellChecking ? true
+, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet
+, libxml2, perl, pcre
+}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull gnet
+  && !isNull libxml2 && !isNull perl && !isNull pcre;
+assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk;
+assert gtk.glib == gnet.glib;
+
+derivation {
+  name = "pan-0.14.2.90";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://pan.rebelbase.com/download/releases/0.14.2.90/SOURCE/pan-0.14.2.90.tar.bz2;
+    md5 = "03e6d936254e775a94995ba261be23eb";
+  };
+
+  spellChecking = spellChecking;
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  gtkspell = if spellChecking then gtkspell else null;
+  gnet = gnet;
+  libxml2 = libxml2;
+  perl = perl;
+  pcre = pcre;
+}

pkgs/applications/version-management/subversion/builder.sh

@@ -0,0 +1,35 @@
+#! /bin/sh
+
+buildinputs="$openssl $db4 $httpd $swig $python $expat"
+. $stdenv/setup || exit 1
+
+if test $localServer; then
+    extraflags="--with-berkeley-db=$db4 $extraflags"
+fi
+
+if test $sslSupport; then
+    extraflags="--with-ssl --with-libs=$openssl $extraflags"
+fi
+
+if test $httpServer; then
+    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
+    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+fi
+
+if test $swigBindings; then
+    extraflags="--with-swig=$swig $extraflags"
+fi
+
+echo "extra flags: $extraflags"
+
+tar xvfz $src || exit 1
+cd subversion-* || exit 1
+./configure --prefix=$out $extraflags \
+ --without-gdbm --disable-static || exit 1
+make $extramakeflags || exit 1
+make install $extramakeflags || exit 1
+
+if test $swigBindings; then
+    make swig-py || exit 1
+    make install-swig-py || exit 1
+fi

pkgs/applications/version-management/subversion/default.nix

@@ -0,0 +1,32 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, swigBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
+}:
+
+assert !isNull expat;
+assert localServer -> !isNull db4;
+assert httpServer -> !isNull httpd && httpd.expat == expat;
+assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
+assert swigBindings -> !isNull swig && swig.pythonSupport;
+
+derivation {
+  name = "subversion-0.37.0";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://subversion.tigris.org/tarballs/subversion-0.37.0.tar.gz;
+    md5 = "048c4d17d5880dc8f3699020eac56224";
+  };
+
+  openssl = if sslSupport then openssl else null;
+  httpd = if httpServer then httpd else null;
+  db4 = if localServer then db4 else null;
+  swig = if swigBindings then swig else null;
+  python = if swigBindings then swig.python else null;
+
+  inherit stdenv expat localServer httpServer sslSupport swigBindings;
+}

pkgs/applications/video/MPlayer/builder.sh

@@ -0,0 +1,19 @@
+#! /bin/sh
+
+buildinputs="$freetype $x11 $alsa"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+tar xvfj $fonts || exit 1
+cd MPlayer-* || exit 1
+./configure --prefix=$out --with-win32libdir=$win32codecs \
+ --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
+ --with-reallibdir=$win32codecs \
+ --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
+ --disable-lirc --disable-svga --disable-libdv \
+ --disable-vorbis --disable-png --disable-jpeg --disable-gif \
+ --enable-runtime-cpudetection \
+ || exit 1
+make || exit 1
+make install || exit 1
+cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1

pkgs/applications/video/MPlayer/default.nix

@@ -0,0 +1,31 @@
+{ alsaSupport ? false
+, stdenv, fetchurl, x11, freetype, alsa ? null}:
+
+assert !isNull x11 && !isNull freetype;
+assert alsaSupport -> !isNull alsa;
+
+derivation {
+  name = "MPlayer-1.0pre3";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre3.tar.bz2;
+    md5 = "998becb79417c6a14d15c07e85188b82";
+  };
+  fonts = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
+    md5 = "1ecd31d17b51f16332b1fcc7da36b312";
+  };
+
+  alsaSupport = alsaSupport;
+
+  stdenv = stdenv;
+  x11 = x11;
+  freetype = freetype;
+  alsa = if alsaSupport then alsa else null;
+  win32codecs = (import ./win32codecs) {
+    stdenv = stdenv;
+    fetchurl = fetchurl;
+  };
+}

pkgs/applications/video/MPlayer/win32codecs/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir $out || exit 1
+cd $out || exit 1
+tar xvfj $src || exit 1
+mv extralite/* . || exit 1
+rmdir extralite || exit 1

pkgs/applications/video/MPlayer/win32codecs/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "win32codecs-1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
+    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
+  };
+  stdenv = stdenv;
+}

pkgs/applications/video/mplayerplug-in/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$x11"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd mplayer* || exit 1
+./configure || exit 1
+make || exit 1
+mkdir -p $out/lib/mozilla/plugins || exit 1
+cp mplayerplug-in.so $out/lib/mozilla/plugins || exit 1

pkgs/applications/video/mplayerplug-in/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, x11}:
+
+assert !isNull x11;
+
+derivation {
+  name = "mplayerplug-in-1.0pre2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-1.0pre2.tar.gz;
+    md5 = "1a6eb243989c143984bb1aac63b5282e";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+}

pkgs/applications/video/vlc/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$x11 $wxGTK $libdvdcss $libdvdread $libdvdplay $mpeg2dec $a52dec $libmad $alsa"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd vlc-* || exit 1
+./configure --prefix=$out \
+ --disable-ffmpeg \
+ --enable-alsa \
+ || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/video/vlc/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
+, mpeg2dec, a52dec, libmad, alsa}:
+
+assert !isNull x11 && !isNull wxGTK && !isNull libdvdcss
+  && !isNull libdvdplay && !isNull mpeg2dec && !isNull a52dec
+  && !isNull libmad && !isNull alsa;
+assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+
+derivation {
+  name = "vlc-0.7.0";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.0/vlc-0.7.0.tar.gz;
+    md5 = "05efef68528892ca933585c7db0842e3";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+  wxGTK = wxGTK;
+  libdvdcss = libdvdcss;
+  libdvdplay = libdvdplay;
+  libdvdread = libdvdplay.libdvdread;
+  mpeg2dec = mpeg2dec;
+  a52dec = a52dec;
+  libmad = libmad;
+  alsa = alsa;
+}

pkgs/applications/video/zapping/builder.sh

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

pkgs/applications/video/zapping/default.nix

@@ -0,0 +1,45 @@
+{ teletextSupport ? true
+, jpegSupport ? true
+, pngSupport ? true
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+, libglade, scrollkeeper, esound, gettext
+, zvbi ? null, libjpeg ? null, libpng ? null }:
+
+assert !isNull pkgconfig && !isNull perl && !isNull python &&
+  !isNull x11 && !isNull libgnomeui && !isNull libglade &&
+  !isNull scrollkeeper && !isNull esound && !isNull gettext;
+
+assert teletextSupport -> !isNull zvbi && zvbi.pngSupport
+  && pngSupport && zvbi.libpng == libpng;
+
+assert jpegSupport -> !isNull libjpeg;
+assert pngSupport -> !isNull libpng;
+
+derivation {
+  name = "zapping-0.7cvs6";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
+    md5 = "cdedc0088c70f4520c37066ec05cb996";
+  };
+
+  teletextSupport = teletextSupport;
+  jpegSupport = jpegSupport;
+  pngSupport = pngSupport;
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  python = python;
+  x11 = x11;
+  libgnomeui = libgnomeui;
+  libglade = libglade;
+  scrollkeeper = scrollkeeper;
+  esound = esound;
+  gettext = gettext;
+  zvbi = if teletextSupport then zvbi else null;
+  libjpeg = if jpegSupport then libjpeg else null;
+  libpng = if pngSupport then libpng else null;
+}

pkgs/build-support/fetchfile/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+. $stdenv/setup
+
+echo "copying $url into $out..."
+
+cp "$pathname" "$out" || exit 1
+
+actual=$(md5sum -b $out | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi

pkgs/build-support/fetchfile/default.nix

@@ -0,0 +1,9 @@
+{stdenv}: {pathname, md5}: derivation {
+  name = baseNameOf (toString url);
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  pathname = pathname;
+  md5 = md5;
+  id = md5;
+}

pkgs/build-support/fetchsvn/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$subversion"
+. $stdenv/setup
+
+echo "exporting $url (r$rev) into $out..."
+
+svn export -r $rev "$url" $out || exit 1
+
+echo $rev > $out/svn-revision || exit 1

pkgs/build-support/fetchsvn/default.nix

@@ -0,0 +1,9 @@
+{stdenv, subversion}: {url, rev}: derivation {
+  name = "svn-checkout";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  subversion = subversion;
+  url = url;
+  rev = rev;
+}

pkgs/build-support/fetchurl/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+. $stdenv/setup
+
+echo "downloading $url into $out..."
+
+wget --passive-ftp "$url" -O "$out" || exit 1
+
+actual=$(md5sum -b $out | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi

pkgs/build-support/fetchurl/default.nix

@@ -0,0 +1,9 @@
+{stdenv}: {url, md5}: derivation {
+  name = baseNameOf (toString url);
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  url = url;
+  md5 = md5;
+  id = md5;
+}

pkgs/build-support/gcc-wrapper/builder.sh

@@ -0,0 +1,84 @@
+#! /bin/sh -e
+
+. $stdenv/setup
+
+
+# Force gcc to use ld-wrapper.sh when calling ld.
+cflagsCompile="-B$out/bin"
+
+if test -n "$glibc"; then
+    # The "-B$glibc/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.  The real solution is of course to prevent those paths
+    # from being used by gcc in the first place.
+    cflagsCompile="$cflagsCompile -B$glibc/lib -isystem $glibc/include"
+    ldflags="$ldflags -L$glibc/lib -rpath $glibc/lib -dynamic-linker $glibc/lib/ld-linux.so.2"
+fi
+
+if test -n "$gcc"; then
+    ldflags="$ldflags -L$gcc/lib -rpath $gcc/lib"
+fi
+
+if test -n "$isNative"; then
+    gccPath="$nativePrefix/bin"
+    ldPath="$nativePrefix/bin"
+else
+    gccPath="$gcc/bin"
+    ldPath="$binutils/bin"
+fi
+
+
+mkdir $out
+mkdir $out/bin
+
+
+mkGccWrapper () {
+    local dst=$1
+    local src=$2
+
+    if ! test -f "$src"; then
+        echo "$src does not exist (skipping)"
+        return
+    fi
+
+    sed \
+        -e "s^@gcc@^$src^g" \
+        -e "s^@out@^$out^g" \
+        < $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++
+
+mkGccWrapper $out/bin/g77 $gccPath/g77
+ln -s g77 $out/bin/f77
+
+
+sed \
+    -e "s^@ldflags@^$ldflags^g" \
+    -e "s^@ld@^$ldPath/ld^g" \
+    < $ldWrapper > $out/bin/ld
+chmod +x $out/bin/ld
+
+
+mkdir $out/nix-support
+test -z "$gcc" && echo $gcc > $out/nix-support/orig-gcc
+test -n "$glibc" && echo $glibc > $out/nix-support/orig-glibc
+
+cat > $out/nix-support/add-flags <<EOF
+NIX_CFLAGS_COMPILE="$cflagsCompile \$NIX_CFLAGS_COMPILE"
+NIX_CFLAGS_LINK="$cflagsLink \$NIX_CFLAGS_LINK"
+NIX_LDFLAGS="$ldflags \$NIX_LDFLAGS"
+EOF
+
+sed \
+    -e "s^@isNative@^$isNative^g" \
+    -e "s^@enforcePurity@^$enforcePurity^g" \
+    -e "s^@gcc@^$gcc^g" \
+    -e "s^@binutils@^$binutils^g" \
+    -e "s^@glibc@^$glibc^g" \
+    < $setupHook > $out/nix-support/setup-hook

pkgs/build-support/gcc-wrapper/default.nix

@@ -0,0 +1,25 @@
+# The Nix `gcc' derivation 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
+# derivation provides a wrapper that sets up the right environment
+# variables so that the compiler and the linker just "work".
+
+{ name, stdenv, isNative, nativePrefix ? ""
+, gcc ? null, glibc ? null, binutils ? null}:
+
+assert isNative -> nativePrefix != "";
+assert !isNative -> gcc != null && glibc != null && binutils != null;
+
+derivation {
+  system = stdenv.system;
+  builder = ./builder.sh;
+  setupHook = ./setup-hook.sh;
+  gccWrapper = ./gcc-wrapper.sh;
+  ldWrapper = ./ld-wrapper.sh;
+  inherit name stdenv isNative nativePrefix gcc glibc binutils;
+  enforcePurity = if isNative then false else gcc.enforcePurity;
+  langC = if isNative then true else gcc.langC;
+  langCC = if isNative then true else gcc.langCC;
+  langF77 = if isNative then false else gcc.langF77;
+}

pkgs/build-support/gcc-wrapper/gcc-wrapper.sh

@@ -0,0 +1,107 @@
+#! /bin/sh
+
+if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
+    . "$NIX_GCC_WRAPPER_START_HOOK"
+fi
+
+if test -z "$NIX_GLIBC_FLAGS_SET"; then
+    . @out@/nix-support/add-flags
+fi
+
+
+# Figure out if linker flags should be passed.  GCC prints annoying
+# warnings when they are not needed.
+dontLink=0
+if test "$*" = "-v" -o -z "$*"; then
+    dontLink=1
+else    
+    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
+        fi
+    done
+fi
+
+
+# Optionally filter out paths not refering to the store.
+skip () {
+    if test "$NIX_DEBUG" = "1"; then
+        echo "skipping impure path $1" >&2
+    fi
+}
+
+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/" -a "${p:2:${#NIX_STORE}}" != "$NIX_STORE"; then
+            skip $p
+        elif test "$p" = "-L" -a "${p2:0:${#NIX_STORE}}" != "$NIX_STORE"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:3}" = "-I/" -a "${p:2:${#NIX_STORE}}" != "$NIX_STORE"; then
+            skip $p
+        elif test "$p" = "-I" -a "${p2:0:${#NIX_STORE}}" != "$NIX_STORE"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-isystem" -a "${p2:0:${#NIX_STORE}}" != "$NIX_STORE"; 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.
+extra=($NIX_CFLAGS_COMPILE)
+
+if test "$dontLink" != "1"; then
+
+    # Add the flags that should only be passed to the compiler when
+    # linking.
+    extra=(${extra[@]} $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; do
+        extra=(${extra[@]} "-Wl,$i")
+    done
+    export NIX_LDFLAGS_SET=1
+
+    if test "$NIX_STRIP_DEBUG" = "1"; then
+        # Add executable-stripping flags.
+        extra=(${extra[@]} $NIX_CFLAGS_STRIP)
+    fi
+fi
+
+# Optionally print debug info.
+if test "$NIX_DEBUG" = "1"; then
+  echo "original flags to @gcc@:" >&2
+  for i in "${params[@]}"; do
+      echo "  $i" >&2
+  done
+  echo "extra flags to @gcc@:" >&2
+  for i in ${extra[@]}; do
+      echo "  $i" >&2
+  done
+fi
+
+if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
+    . "$NIX_GCC_WRAPPER_EXEC_HOOK"
+fi
+
+exec @gcc@ "${params[@]}" ${extra[@]}

pkgs/build-support/gcc-wrapper/ld-wrapper.sh

@@ -0,0 +1,59 @@
+#! /bin/sh
+
+if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
+    . "$NIX_LD_WRAPPER_START_HOOK"
+fi
+
+# Optionally filter out paths not refering to the store.
+skip () {
+    if test "$NIX_DEBUG" = "1"; then
+        echo "skipping impure path $1" >&2
+    fi
+}
+
+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/" -a "${p:2:${#NIX_STORE}}" != "$NIX_STORE"; then
+            skip $p
+        elif test "$p" = "-L" -a "${p2:0:${#NIX_STORE}}" != "$NIX_STORE"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:1}" = "/" -a "${p:0:${#NIX_STORE}}" != "$NIX_STORE"; then
+            # We cannot skip this; barf.
+            echo "impure path \`$p' used in link"
+            exit 1
+        else
+            rest=("${rest[@]}" "$p")
+        fi
+        n=$((n + 1))
+    done
+    params=("${rest[@]}")
+fi
+
+
+extra=()
+
+if test -z "$NIX_LDFLAGS_SET"; then
+    extra=(${extra[@]} $NIX_LDFLAGS)
+fi
+
+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
+    . "$NIX_LD_WRAPPER_EXEC_HOOK"
+fi
+
+exec @ld@ "${params[@]}" ${extra[@]}

pkgs/build-support/gcc-wrapper/setup-hook.sh

@@ -0,0 +1,28 @@
+addCVars () {
+    if test -d $1/include; then
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+    fi
+
+    if test -d $1/lib; then
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib -rpath $1/lib"
+    fi
+}
+
+envHooks=(${envHooks[@]} addCVars)
+
+export NIX_IS_NATIVE=@isNative@
+export NIX_ENFORCE_PURITY=@enforcePurity@
+
+# 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 "@glibc@"; then
+    PATH=$PATH:@glibc@/bin
+fi

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh

@@ -0,0 +1,7 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir -p $out/xml/dtd/docbook || exit 1
+cd $out/xml/dtd/docbook || exit 1
+$unzip/bin/unzip $src || exit 1

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, unzip}:
+
+assert !isNull unzip;
+
+derivation {
+  name = "docbook-xml-4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip;
+    md5 = "73fe50dfe74ca631c1602f558ed8961f";
+  };
+  stdenv = stdenv;
+  unzip = unzip;
+}

pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir $out || exit 1
+cd $out || exit 1
+tar xvfz $src || exit 1
+mkdir xml || exit 1
+mkdir xml/xsl || exit 1
+mv docbook-xsl-* xml/xsl/docbook || exit 1

pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+derivation {
+  name = "docbook-xsl-1.64.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://cesnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.tar.gz;
+    md5 = "ed766902e8381f6206d12f5c326fbd47";
+  };
+  stdenv = stdenv;
+}

pkgs/development/compilers/gcc/builder.sh

@@ -0,0 +1,65 @@
+#! /bin/sh -e
+
+buildinputs="$binutils"
+. $stdenv/setup
+
+tar xvfj $src
+
+if test "$enforcePurity" = "1"; then
+    # Disable the standard include directories.
+    cd gcc-*
+    cat >> ./gcc/cppdefault.h <<EOF
+#undef LOCAL_INCLUDE_DIR
+#undef SYSTEM_INCLUDE_DIR
+#undef STANDARD_INCLUDE_DIR
+EOF
+    cd ..
+fi
+
+langs="c"
+if test -n "$langCC"; then
+    langs="$langs,c++"
+fi
+if test -n "$langF77"; then
+    langs="$langs,f77"
+fi
+
+# Configure.
+mkdir build
+cd build
+../gcc-*/configure --prefix=$out --enable-languages="$langs"
+
+if test "$enforcePurity" = "1"; then
+    # Patch some of the makefiles to force linking against our own glibc.
+    . $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
+    extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
+    for i in $NIX_LDFLAGS; do
+        extraflags="$extraflags -Wl,$i"
+    done
+
+    mf=Makefile
+    sed \
+        -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
+        < $mf > $mf.tmp
+    mv $mf.tmp $mf
+
+    mf=gcc/Makefile
+    sed \
+        -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
+        < $mf > $mf.tmp
+    mv $mf.tmp $mf
+
+    # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
+    # from /usr/include.
+    mf=gcc/Makefile
+    sed \
+        -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
+        < $mf > $mf.tmp
+    mv $mf.tmp $mf
+fi
+
+# Build and install.
+make bootstrap
+make install
+
+find $out -name "*.a" -exec strip -S {} \;

pkgs/development/compilers/gcc/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, enforcePurity ? true
+, langC ? true, langCC ? true, langF77 ? false
+}:
+
+assert langC;
+
+derivation {
+  name = "gcc-3.3.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2;
+    md5 = "65999f654102f5438ac8562d13a6eced";
+  };
+#  src = fetchurl {
+#    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
+#    md5 = "3c6cfd9fcd180481063b4058cf6faff2";
+#  };
+  inherit stdenv enforcePurity langC langCC langF77;
+}

pkgs/development/compilers/ghc/boot.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, perl}:
+
+assert perl != null;
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "ghc-6.2";
+  system = stdenv.system;
+  builder = ./boot.sh;
+  src = fetchurl {
+    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-i386-unknown-linux.tar.bz2;
+    md5 = "5b2f19ca00fd7494002047d7fb4dce3e";
+  };
+  inherit stdenv perl;
+}

pkgs/development/compilers/ghc/boot.sh

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

pkgs/development/compilers/ghc/builder.sh

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

pkgs/development/compilers/ghc/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, perl, ghc, m4}:
+
+assert perl != null && ghc != null && m4 != null;
+
+derivation {
+  name = "ghc-6.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-src.tar.bz2;
+    md5 = "cc495e263f4384e1d6b38e851bf6eca0";
+  };
+  inherit stdenv perl ghc m4;
+}

pkgs/development/compilers/helium/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+buildinputs="$ghc"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd helium-* || exit 1
+cd lvm/src || exit 1
+./configure --prefix $out || exit 1
+cd ../../heliumNT || exit 1
+./configure --prefix=$out || exit 1
+cd src || exit 1
+make depend || exit 1
+make EXTRA_HC_OPTS=-O2 || exit 1
+make install

pkgs/development/compilers/helium/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, ghc}:
+
+assert ghc != null;
+
+derivation {
+  name = "helium-1.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cs.uu.nl/helium/distr/helium-1.2-src.tar.gz;
+    md5 = "6ea1d6e4436e137d75f5354b4758f299";
+  };
+  inherit stdenv ghc;
+}

pkgs/development/compilers/j2sdk/builder.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. $stdenv/setup || exit 1
+version=j2sdk1.4.2_03
+src=$version.bin
+
+cp $pathname $src || exit 1
+
+actual=$(md5sum -b $src | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi
+
+chmod u+x $src || exit 1
+
+alias more=cat
+
+yes yes | ./$src || exit 1
+
+mkdir $out || exit 1
+mv $version/* $out/ || exit 1

pkgs/development/compilers/j2sdk/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2sdk-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/compilers/j2sdk/j2sdk-sun-linux.nix

@@ -0,0 +1,22 @@
+/**
+ * This Nix expression requires the user to download the j2sdk
+ * distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin
+ * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
+ *
+ * Note that this is not necessary if someone has already pushed a
+ * binary.
+ *
+ * @author Martin Bravenboer <martin@cs.uu.nl>
+ */
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "j2sdk-1.4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  pathname = "/tmp/j2sdk-1_4_2_03-linux-i586.bin";
+  md5 = "859aa6750161477acec83b7bb5d9998d";
+  stdenv = stdenv;
+}

pkgs/development/compilers/jikes/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd jikes-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+

pkgs/development/compilers/jikes/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "jikes-1.18";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2;
+    md5 = "74bbcfd31aa2d7df4b86c5fe2db315cc";
+  };
+  stdenv = stdenv;
+}

pkgs/development/compilers/strategoxt/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf"
+. $stdenv/setup || exit 1
+
+tar zxf $src || exit 1
+cd $dir* || exit 1
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/compilers/strategoxt/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4626";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://losser.labs.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/strategoxt-0.9.4-4626.tar.gz;
+    md5 = "f33ae9fdb9d8628ae01fa0f26bfa0429";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}

pkgs/development/compilers/strategoxt/dist.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4792";
+  system = stdenv.system;
+  builder = ./svnbuilder.sh;
+  src = fetchsvn {
+    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
+    rev = "4792";
+  };
+  stdenv = stdenv;
+
+  make     = autotools.make;
+  automake = autotools.automake;
+  autoconf = autotools.autoconf;
+  libtool  = autotools.libtool;
+  which    = which;
+
+  aterm = aterm;
+  sdf = sdf;
+}

pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.3.tar.gz;
+    md5 = "3425e7ae896426481bd258817737e3d6";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}

pkgs/development/compilers/strategoxt/svnbuilder.sh

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf $make $automake $autoconf $libtool $which"
+. $stdenv/setup || exit 1
+
+echo "pwd = `pwd`"
+echo "PATH = $PATH"
+
+cp -r $src strategoxt || exit 1
+chmod -R +w strategoxt
+cd strategoxt || exit 1
+./bootstrap || exit 1
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
+make install || exit 1

pkgs/development/compilers/strategoxt/trunk.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4792";
+  system = stdenv.system;
+  builder = ./svnbuilder.sh;
+  src = fetchsvn {
+    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
+    rev = "4792";
+  };
+  stdenv = stdenv;
+
+  make     = autotools.make;
+  automake = autotools.automake;
+  autoconf = autotools.autoconf;
+  libtool  = autotools.libtool;
+  which    = which;
+
+  aterm = aterm;
+  sdf = sdf;
+}

pkgs/development/compilers/tiger/builder.sh

@@ -0,0 +1,17 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf $strategoxt"
+. $stdenv/setup || exit 1
+
+tar zxf $src || exit 1
+cd tiger-* || exit 1
+./configure --prefix=$out \
+	--with-aterm=$aterm \
+	--with-sdf=$sdf \
+	--with-stratego-xt=$strategoxt \
+        --enable-tiger \
+        --enable-ir \
+	--enable-asm \
+    || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/compilers/tiger/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, aterm, sdf, strategoxt}: derivation {
+  name = "tiger-1.3-4631";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/tiger/src/tiger-1.3-4631.tar.gz;
+    md5 = "1ea6070d84134eb6cff7fb32a75ef90a";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  strategoxt = strategoxt;
+}

pkgs/development/interpreters/j2re/builder.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. $stdenv/setup || exit 1
+version=j2re1.4.2_03
+
+cp $src $version.bin || exit 1
+chmod u+x $version.bin || exit 1
+
+alias more=cat
+
+yes yes | ./$version.bin || exit 1
+
+mkdir $out || exit 1
+mv $version/* $out/ || exit 1

pkgs/development/interpreters/j2re/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2re-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/interpreters/j2re/j2re-sun-linux.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+
+derivation {
+  name = "j2re-1.4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = http://java.sun.com/webapps/download/AutoDL?BundleId=9500;
+      md5 = "b4aae3fcda73d976bd6ae6349b36a90c";
+    };
+  stdenv = stdenv;
+}

pkgs/development/interpreters/perl/builder.sh

@@ -0,0 +1,28 @@
+#! /bin/sh -e
+
+buildinputs="$patch"
+. $stdenv/setup
+
+tar xvfz $src
+cd perl-*
+
+# Perl's Configure messes with PATH.  We can't have that, so we patch it.
+# Yeah, this is an ugly hack.
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
+    cat Configure | \
+        grep -v '^paths=' | \
+        grep -v '^locincpth=' | \
+        grep -v '^xlibpth=' | \
+        grep -v '^glibpth=' | \
+        grep -v '^loclibpth=' | \
+        grep -v '^locincpth=' | \
+        cat > Configure.tmp
+    mv Configure.tmp Configure
+    chmod +x Configure
+fi
+
+patch -p1 < $srcPatch
+
+./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl
+make
+make install

pkgs/development/interpreters/perl/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, patch}:
+
+derivation {
+  name = "perl-5.8.3";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.cs.uu.nl/mirror/CPAN/src/5.0/perl-5.8.3.tar.gz;
+    md5 = "6d2b389f8c6424b7af303f417947714f";
+  };
+
+  # This patch does the following:
+  # 1) Do use the PATH environment variable to find the `pwd' command.
+  #    By default, Perl will only look for it in /lib and /usr/lib.
+  #    !!! what are the security implications of this?
+  # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
+  #    systems.  (This actually appears to be due to a bug in Perl.)
+
+  srcPatch = ./patch;
+
+  inherit stdenv patch;
+}

pkgs/development/interpreters/perl/patch

@@ -0,0 +1,42 @@
+diff -rc perl-5.8.3-orig/ext/Errno/Errno_pm.PL perl-5.8.3/ext/Errno/Errno_pm.PL
+*** perl-5.8.3-orig/ext/Errno/Errno_pm.PL	2003-08-04 09:37:13.000000000 +0200
+--- perl-5.8.3/ext/Errno/Errno_pm.PL	2004-02-20 16:59:05.000000000 +0100
+***************
+*** 105,111 ****
+  	# Watch out for cross compiling for EPOC (usually done on linux)
+  	$file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
+      } elsif ($^O eq 'linux' &&
+! 	     $Config{gccversion} ne '' # might be using, say, Intel's icc
+  	     ) {
+  	# Some Linuxes have weird errno.hs which generate
+  	# no #file or #line directives
+--- 105,111 ----
+  	# Watch out for cross compiling for EPOC (usually done on linux)
+  	$file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1;
+      } elsif ($^O eq 'linux' &&
+! 	     $Config{gccversion} eq '' # might be using, say, Intel's icc
+  	     ) {
+  	# Some Linuxes have weird errno.hs which generate
+  	# no #file or #line directives
+Only in perl-5.8.3/ext/Errno: Errno_pm.PL~
+diff -rc perl-5.8.3-orig/lib/Cwd.pm perl-5.8.3/lib/Cwd.pm
+*** perl-5.8.3-orig/lib/Cwd.pm	2003-12-20 00:05:30.000000000 +0100
+--- perl-5.8.3/lib/Cwd.pm	2004-02-20 16:58:16.000000000 +0100
+***************
+*** 201,207 ****
+  
+  # The 'natural and safe form' for UNIX (pwd may be setuid root)
+  sub _backtick_pwd {
+!     local @ENV{qw(PATH IFS CDPATH ENV BASH_ENV)};
+      my $cwd = `$pwd_cmd`;
+      # Belt-and-suspenders in case someone said "undef $/".
+      local $/ = "\n";
+--- 201,207 ----
+  
+  # The 'natural and safe form' for UNIX (pwd may be setuid root)
+  sub _backtick_pwd {
+!     local @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+      my $cwd = `$pwd_cmd`;
+      # Belt-and-suspenders in case someone said "undef $/".
+      local $/ = "\n";
+Only in perl-5.8.3/lib: Cwd.pm~

pkgs/development/interpreters/python/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+buildinputs=""
+if test -n "$zlibSupport"; then
+  buildinputs="$zlib $buildinputs"
+fi
+. $stdenv/setup
+
+tar xvfj $src
+cd Python-*
+./configure --prefix=$out
+
+make
+make install
+

pkgs/development/interpreters/python/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, zlib ? null, zlibSupport ? true}:
+
+assert zlibSupport -> zlib != null;
+
+derivation {
+  name = "python-2.3.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = http://www.python.org/ftp/python/2.3.3/Python-2.3.3.tar.bz2;
+      md5 = "70ada9f65742ab2c77a96bcd6dffd9b1";
+  };
+  zlib = if zlibSupport then zlib else null;
+  inherit stdenv zlibSupport;
+}

pkgs/development/libraries/a52dec/builder.sh

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