From 12ae5363ea658d399bdb008f6ded3cde355f9310 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Mar 2004 17:23:01 +0000
Subject: * Remove trivial builders. * Make builders unexecutable by removing
 the hash-bang line and   execute permission. * Convert calls to `derivation'
 to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to  
 `mkDerivation'.  These transformations were all done automatically,   so it
 is quite possible I broke stuff. * Put the `mkDerivation' function in
 stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
---
 pkgs/development/compilers/gcc/builder.sh                      | 2 --
 pkgs/development/compilers/gcc/default.nix                     | 5 ++---
 pkgs/development/compilers/ghc/builder.sh                      | 2 --
 pkgs/development/compilers/ghc/default.nix                     | 5 ++---
 pkgs/development/compilers/helium/builder.sh                   | 2 --
 pkgs/development/compilers/helium/default.nix                  | 5 ++---
 pkgs/development/compilers/j2sdk/builder.sh                    | 1 -
 pkgs/development/compilers/j2sdk/default.nix                   | 1 -
 pkgs/development/compilers/jikes/builder.sh                    | 2 --
 pkgs/development/compilers/jikes/default.nix                   | 4 +---
 pkgs/development/compilers/strategoxt/builder.sh               | 2 --
 pkgs/development/compilers/strategoxt/default.nix              | 5 ++---
 pkgs/development/compilers/tiger/builder.sh                    | 2 --
 pkgs/development/compilers/tiger/default.nix                   | 4 +---
 pkgs/development/interpreters/j2re/builder.sh                  | 1 -
 pkgs/development/interpreters/j2re/default.nix                 | 1 -
 pkgs/development/interpreters/perl/builder.sh                  | 2 --
 pkgs/development/interpreters/perl/default.nix                 | 5 ++---
 pkgs/development/interpreters/python/builder.sh                | 2 --
 pkgs/development/interpreters/python/default.nix               | 5 ++---
 pkgs/development/libraries/a52dec/builder.sh                   | 2 --
 pkgs/development/libraries/a52dec/default.nix                  | 4 +---
 pkgs/development/libraries/audiofile/builder.sh                | 2 --
 pkgs/development/libraries/audiofile/default.nix               | 4 +---
 pkgs/development/libraries/db4/builder.sh                      | 2 --
 pkgs/development/libraries/db4/default.nix                     | 4 +---
 pkgs/development/libraries/expat/builder.sh                    | 2 --
 pkgs/development/libraries/expat/default.nix                   | 4 +---
 pkgs/development/libraries/fontconfig/builder.sh               | 2 --
 pkgs/development/libraries/fontconfig/default.nix              | 4 +---
 pkgs/development/libraries/freedesktop/libICE/builder.sh       | 3 ---
 pkgs/development/libraries/freedesktop/libICE/default.nix      | 4 +---
 pkgs/development/libraries/freedesktop/libSM/builder.sh        | 3 ---
 pkgs/development/libraries/freedesktop/libSM/default.nix       | 4 +---
 pkgs/development/libraries/freedesktop/libX11/builder.sh       | 3 ---
 pkgs/development/libraries/freedesktop/libX11/default.nix      | 4 +---
 pkgs/development/libraries/freedesktop/libXau/builder.sh       | 5 -----
 pkgs/development/libraries/freedesktop/libXau/default.nix      | 4 +---
 pkgs/development/libraries/freedesktop/libXt/builder.sh        | 3 ---
 pkgs/development/libraries/freedesktop/libXt/default.nix       | 4 +---
 pkgs/development/libraries/freedesktop/libXtrans/builder.sh    | 5 -----
 pkgs/development/libraries/freedesktop/libXtrans/default.nix   | 4 +---
 pkgs/development/libraries/freedesktop/xextensions/builder.sh  | 5 -----
 pkgs/development/libraries/freedesktop/xextensions/default.nix | 4 +---
 pkgs/development/libraries/freedesktop/xlibs/builder.sh        | 1 -
 pkgs/development/libraries/freedesktop/xlibs/default.nix       | 4 +---
 pkgs/development/libraries/freedesktop/xproto/builder.sh       | 5 -----
 pkgs/development/libraries/freedesktop/xproto/default.nix      | 4 +---
 pkgs/development/libraries/freetype/builder.sh                 | 2 --
 pkgs/development/libraries/freetype/default.nix                | 4 +---
 pkgs/development/libraries/gettext/builder.sh                  | 2 --
 pkgs/development/libraries/gettext/default.nix                 | 4 +---
 pkgs/development/libraries/glibc/builder.sh                    | 2 --
 pkgs/development/libraries/glibc/default.nix                   | 5 ++---
 pkgs/development/libraries/gnet/builder.sh                     | 2 --
 pkgs/development/libraries/gnet/default.nix                    | 4 +---
 pkgs/development/libraries/gnome/GConf/builder.sh              | 2 --
 pkgs/development/libraries/gnome/GConf/default.nix             | 4 +---
 pkgs/development/libraries/gnome/ORBit2/builder.sh             | 2 --
 pkgs/development/libraries/gnome/ORBit2/default.nix            | 4 +---
 pkgs/development/libraries/gnome/esound/builder.sh             | 2 --
 pkgs/development/libraries/gnome/esound/default.nix            | 4 +---
 pkgs/development/libraries/gnome/gnome-mime-data/builder.sh    | 2 --
 pkgs/development/libraries/gnome/gnome-mime-data/default.nix   | 4 +---
 pkgs/development/libraries/gnome/gnome-vfs/builder.sh          | 2 --
 pkgs/development/libraries/gnome/gnome-vfs/default.nix         | 4 +---
 pkgs/development/libraries/gnome/libIDL/builder.sh             | 2 --
 pkgs/development/libraries/gnome/libIDL/default.nix            | 4 +---
 pkgs/development/libraries/gnome/libart_lgpl/builder.sh        | 2 --
 pkgs/development/libraries/gnome/libart_lgpl/default.nix       | 4 +---
 pkgs/development/libraries/gnome/libbonobo/builder.sh          | 2 --
 pkgs/development/libraries/gnome/libbonobo/default.nix         | 4 +---
 pkgs/development/libraries/gnome/libbonoboui/builder.sh        | 2 --
 pkgs/development/libraries/gnome/libbonoboui/default.nix       | 4 +---
 pkgs/development/libraries/gnome/libglade/builder.sh           | 2 --
 pkgs/development/libraries/gnome/libglade/default.nix          | 4 +---
 pkgs/development/libraries/gnome/libgnome/builder.sh           | 2 --
 pkgs/development/libraries/gnome/libgnome/default.nix          | 4 +---
 pkgs/development/libraries/gnome/libgnomecanvas/builder.sh     | 2 --
 pkgs/development/libraries/gnome/libgnomecanvas/default.nix    | 4 +---
 pkgs/development/libraries/gnome/libgnomeui/builder.sh         | 2 --
 pkgs/development/libraries/gnome/libgnomeui/default.nix        | 4 +---
 pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh        | 3 ---
 pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix       | 4 +---
 pkgs/development/libraries/gtk+-1/glib/builder.sh              | 3 ---
 pkgs/development/libraries/gtk+-1/glib/default.nix             | 4 +---
 pkgs/development/libraries/gtk+-1/gtk+/builder.sh              | 1 -
 pkgs/development/libraries/gtk+-1/gtk+/default.nix             | 4 +---
 pkgs/development/libraries/gtk+/atk/builder.sh                 | 2 --
 pkgs/development/libraries/gtk+/atk/default.nix                | 4 +---
 pkgs/development/libraries/gtk+/glib/builder.sh                | 2 --
 pkgs/development/libraries/gtk+/glib/default.nix               | 4 +---
 pkgs/development/libraries/gtk+/gtk+/builder.sh                | 2 --
 pkgs/development/libraries/gtk+/gtk+/default.nix               | 4 +---
 pkgs/development/libraries/gtk+/pango/builder.sh               | 2 --
 pkgs/development/libraries/gtk+/pango/default.nix              | 4 +---
 pkgs/development/libraries/libdvdcss/builder.sh                | 2 --
 pkgs/development/libraries/libdvdcss/default.nix               | 4 +---
 pkgs/development/libraries/libdvdplay/builder.sh               | 2 --
 pkgs/development/libraries/libdvdplay/default.nix              | 4 +---
 pkgs/development/libraries/libdvdread/builder.sh               | 2 --
 pkgs/development/libraries/libdvdread/default.nix              | 4 +---
 pkgs/development/libraries/libjpeg/builder.sh                  | 2 --
 pkgs/development/libraries/libjpeg/default.nix                 | 4 +---
 pkgs/development/libraries/libmad/builder.sh                   | 2 --
 pkgs/development/libraries/libmad/default.nix                  | 4 +---
 pkgs/development/libraries/libpng/builder.sh                   | 2 --
 pkgs/development/libraries/libpng/default.nix                  | 4 +---
 pkgs/development/libraries/libtiff/builder.sh                  | 2 --
 pkgs/development/libraries/libtiff/default.nix                 | 4 +---
 pkgs/development/libraries/libxml2/builder.sh                  | 2 --
 pkgs/development/libraries/libxml2/default.nix                 | 4 +---
 pkgs/development/libraries/libxslt/builder.sh                  | 2 --
 pkgs/development/libraries/libxslt/default.nix                 | 4 +---
 pkgs/development/libraries/mpeg2dec/builder.sh                 | 2 --
 pkgs/development/libraries/mpeg2dec/default.nix                | 4 +---
 pkgs/development/libraries/ncurses/builder.sh                  | 2 --
 pkgs/development/libraries/ncurses/default.nix                 | 4 +---
 pkgs/development/libraries/openssl/builder.sh                  | 2 --
 pkgs/development/libraries/openssl/default.nix                 | 5 ++---
 pkgs/development/libraries/pcre/builder.sh                     | 3 ---
 pkgs/development/libraries/pcre/default.nix                    | 5 +----
 pkgs/development/libraries/popt/builder.sh                     | 2 --
 pkgs/development/libraries/popt/default.nix                    | 4 +---
 pkgs/development/libraries/rna/builder.sh                      | 2 --
 pkgs/development/libraries/rna/default.nix                     | 5 ++---
 pkgs/development/libraries/scrollkeeper/builder.sh             | 2 --
 pkgs/development/libraries/scrollkeeper/default.nix            | 4 +---
 pkgs/development/libraries/wxGTK/builder.sh                    | 2 --
 pkgs/development/libraries/wxGTK/default.nix                   | 5 ++---
 pkgs/development/libraries/xft/builder.sh                      | 2 --
 pkgs/development/libraries/xft/default.nix                     | 4 +---
 pkgs/development/libraries/zlib/builder.sh                     | 4 ----
 pkgs/development/libraries/zlib/default.nix                    | 5 ++---
 pkgs/development/libraries/zvbi/builder.sh                     | 2 --
 pkgs/development/libraries/zvbi/default.nix                    | 4 +---
 pkgs/development/perl-modules/BerkeleyDB/builder.sh            | 2 --
 pkgs/development/perl-modules/BerkeleyDB/default.nix           | 4 +---
 pkgs/development/perl-modules/XML-Parser/builder.sh            | 2 --
 pkgs/development/perl-modules/XML-Parser/default.nix           | 4 +---
 pkgs/development/python-modules/wxPython/builder.sh            | 2 --
 pkgs/development/python-modules/wxPython/default.nix           | 5 ++---
 pkgs/development/tools/build-managers/apache-ant/builder.sh    | 2 --
 pkgs/development/tools/build-managers/apache-ant/default.nix   | 4 +---
 pkgs/development/tools/build-managers/gnumake/builder.sh       | 3 ---
 pkgs/development/tools/build-managers/gnumake/default.nix      | 5 +----
 pkgs/development/tools/misc/autoconf/builder.sh                | 2 --
 pkgs/development/tools/misc/autoconf/default.nix               | 4 +---
 pkgs/development/tools/misc/autoconf/libtoolbuilder.sh         | 0
 pkgs/development/tools/misc/automake/builder.sh                | 2 --
 pkgs/development/tools/misc/automake/default.nix               | 4 +---
 pkgs/development/tools/misc/binutils/builder.sh                | 2 --
 pkgs/development/tools/misc/binutils/default.nix               | 5 ++---
 pkgs/development/tools/misc/gnum4/builder.sh                   | 2 --
 pkgs/development/tools/misc/gnum4/default.nix                  | 4 +---
 pkgs/development/tools/misc/gperf/builder.sh                   | 2 --
 pkgs/development/tools/misc/gperf/default.nix                  | 4 +---
 pkgs/development/tools/misc/libtool/builder.sh                 | 2 --
 pkgs/development/tools/misc/libtool/default.nix                | 4 +---
 pkgs/development/tools/misc/octavefront/builder.sh             | 2 --
 pkgs/development/tools/misc/octavefront/default.nix            | 5 ++---
 pkgs/development/tools/misc/pkgconfig/builder.sh               | 2 --
 pkgs/development/tools/misc/pkgconfig/default.nix              | 4 +---
 pkgs/development/tools/misc/swig/builder.sh                    | 2 --
 pkgs/development/tools/misc/swig/default.nix                   | 4 +---
 pkgs/development/tools/misc/texinfo/builder.sh                 | 2 --
 pkgs/development/tools/misc/texinfo/default.nix                | 5 ++---
 pkgs/development/tools/misc/valgrind/builder.sh                | 2 --
 pkgs/development/tools/misc/valgrind/default.nix               | 4 +---
 pkgs/development/tools/parsing/asc-support/builder.sh          | 2 --
 pkgs/development/tools/parsing/asf-support/builder.sh          | 2 --
 pkgs/development/tools/parsing/bison/builder-new.sh            | 2 --
 pkgs/development/tools/parsing/bison/builder.sh                | 2 --
 pkgs/development/tools/parsing/bison/default.nix               | 4 +---
 pkgs/development/tools/parsing/flex/builder-new.sh             | 2 --
 pkgs/development/tools/parsing/flex/builder.sh                 | 2 --
 pkgs/development/tools/parsing/flex/default.nix                | 4 +---
 pkgs/development/tools/parsing/pgen/builder.sh                 | 2 --
 pkgs/development/tools/parsing/pt-support/builder.sh           | 2 --
 pkgs/development/tools/parsing/sdf-support/builder.sh          | 2 --
 pkgs/development/tools/parsing/sdf2/builder.sh                 | 2 --
 pkgs/development/tools/parsing/sdf2/default.nix                | 4 +---
 pkgs/development/tools/parsing/sglr/builder.sh                 | 2 --
 pkgs/development/tools/parsing/toolbuslib/builder.sh           | 2 --
 184 files changed, 100 insertions(+), 469 deletions(-)
 mode change 100755 => 100644 pkgs/development/compilers/gcc/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/ghc/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/helium/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/j2sdk/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/jikes/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/strategoxt/builder.sh
 mode change 100755 => 100644 pkgs/development/compilers/tiger/builder.sh
 mode change 100755 => 100644 pkgs/development/interpreters/j2re/builder.sh
 mode change 100755 => 100644 pkgs/development/interpreters/perl/builder.sh
 mode change 100755 => 100644 pkgs/development/interpreters/python/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/a52dec/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/audiofile/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/db4/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/expat/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/fontconfig/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libICE/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libSM/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libX11/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libXau/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libXt/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/libXtrans/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/xextensions/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/freedesktop/xlibs/builder.sh
 delete mode 100755 pkgs/development/libraries/freedesktop/xproto/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/freetype/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gettext/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/glibc/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnet/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/GConf/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/ORBit2/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/esound/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/gnome-mime-data/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/gnome-vfs/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libIDL/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libart_lgpl/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libbonobo/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libbonoboui/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libglade/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libgnome/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libgnomecanvas/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libgnomeui/builder.sh
 delete mode 100755 pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
 delete mode 100755 pkgs/development/libraries/gtk+-1/glib/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gtk+-1/gtk+/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gtk+/atk/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gtk+/glib/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gtk+/gtk+/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/gtk+/pango/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libdvdcss/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libdvdplay/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libdvdread/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libjpeg/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libmad/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libpng/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libtiff/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libxml2/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/libxslt/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/mpeg2dec/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/ncurses/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/openssl/builder.sh
 delete mode 100755 pkgs/development/libraries/pcre/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/popt/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/rna/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/scrollkeeper/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/wxGTK/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/xft/builder.sh
 delete mode 100755 pkgs/development/libraries/zlib/builder.sh
 mode change 100755 => 100644 pkgs/development/libraries/zvbi/builder.sh
 mode change 100755 => 100644 pkgs/development/perl-modules/BerkeleyDB/builder.sh
 mode change 100755 => 100644 pkgs/development/perl-modules/XML-Parser/builder.sh
 mode change 100755 => 100644 pkgs/development/python-modules/wxPython/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/build-managers/apache-ant/builder.sh
 delete mode 100755 pkgs/development/tools/build-managers/gnumake/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/autoconf/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/autoconf/libtoolbuilder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/automake/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/binutils/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/gnum4/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/gperf/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/libtool/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/octavefront/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/pkgconfig/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/swig/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/texinfo/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/misc/valgrind/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/asf-support/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/bison/builder-new.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/bison/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/flex/builder-new.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/flex/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/pt-support/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/sdf-support/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/sdf2/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/sglr/builder.sh
 mode change 100755 => 100644 pkgs/development/tools/parsing/toolbuslib/builder.sh

(limited to 'pkgs/development')

diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
old mode 100755
new mode 100644
index a5aa83cc61147..c97c9823b34f7
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index cedd38dac843b..46b6a2d863e3e 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -4,13 +4,12 @@
 
 assert langC;
 
-derivation {
+stdenv.mkDerivation {
   name = "gcc-3.3.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   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 noSysDirs langC langCC langF77;
+  inherit noSysDirs langC langCC langF77;
 }
diff --git a/pkgs/development/compilers/ghc/builder.sh b/pkgs/development/compilers/ghc/builder.sh
old mode 100755
new mode 100644
index 9a2a235158f56..168ca0cbab7d4
--- a/pkgs/development/compilers/ghc/builder.sh
+++ b/pkgs/development/compilers/ghc/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $ghc $m4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index 5872c81eb8bca..fafd3982aa751 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -2,13 +2,12 @@
 
 assert perl != null && ghc != null && m4 != null;
 
-derivation {
+stdenv.mkDerivation {
   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;
+  inherit perl ghc m4;
 }
diff --git a/pkgs/development/compilers/helium/builder.sh b/pkgs/development/compilers/helium/builder.sh
old mode 100755
new mode 100644
index 82667936e43e0..d7946ab8a52da
--- a/pkgs/development/compilers/helium/builder.sh
+++ b/pkgs/development/compilers/helium/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$ghc"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/compilers/helium/default.nix b/pkgs/development/compilers/helium/default.nix
index e45aab344e845..ac4ef2fb20d2a 100644
--- a/pkgs/development/compilers/helium/default.nix
+++ b/pkgs/development/compilers/helium/default.nix
@@ -2,13 +2,12 @@
 
 assert ghc != null;
 
-derivation {
+stdenv.mkDerivation {
   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;
+  inherit ghc;
 }
diff --git a/pkgs/development/compilers/j2sdk/builder.sh b/pkgs/development/compilers/j2sdk/builder.sh
old mode 100755
new mode 100644
index 3cf67f8f4ceed..1f19cde82a813
--- a/pkgs/development/compilers/j2sdk/builder.sh
+++ b/pkgs/development/compilers/j2sdk/builder.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . $stdenv/setup || exit 1
 version=j2sdk1.4.2_03
diff --git a/pkgs/development/compilers/j2sdk/default.nix b/pkgs/development/compilers/j2sdk/default.nix
index 91b60e7fa2872..aae1537011069 100644
--- a/pkgs/development/compilers/j2sdk/default.nix
+++ b/pkgs/development/compilers/j2sdk/default.nix
@@ -3,7 +3,6 @@
 if stdenv.system == "i686-linux"
   then
     (import ./j2sdk-sun-linux.nix) {
-      stdenv   = stdenv;
       fetchurl = fetchurl;
     }
   else
diff --git a/pkgs/development/compilers/jikes/builder.sh b/pkgs/development/compilers/jikes/builder.sh
old mode 100755
new mode 100644
index 7e0cd9e13610f..35b2aa8cc97b7
--- a/pkgs/development/compilers/jikes/builder.sh
+++ b/pkgs/development/compilers/jikes/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix
index cac79a4cad49b..05fd014afc066 100644
--- a/pkgs/development/compilers/jikes/default.nix
+++ b/pkgs/development/compilers/jikes/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   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;
 }
diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh
old mode 100755
new mode 100644
index 68289b2f8be12..5ccf79af02b86
--- a/pkgs/development/compilers/strategoxt/builder.sh
+++ b/pkgs/development/compilers/strategoxt/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildInputs="$aterm $sdf"
 . $stdenv/setup
 
diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix
index 75f8eacc3da45..b4207a3bb9924 100644
--- a/pkgs/development/compilers/strategoxt/default.nix
+++ b/pkgs/development/compilers/strategoxt/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl, aterm, sdf}:
 
-derivation {
+stdenv.mkDerivation {
   name = "strategoxt-0.9.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.4.tar.gz;
     md5 = "b61aee784cebac6cce0d96383bdb1b37";
   };
-  inherit stdenv aterm sdf;
+  inherit aterm sdf;
 }
diff --git a/pkgs/development/compilers/tiger/builder.sh b/pkgs/development/compilers/tiger/builder.sh
old mode 100755
new mode 100644
index 880cd4c4e0589..aab09f5e1ee31
--- a/pkgs/development/compilers/tiger/builder.sh
+++ b/pkgs/development/compilers/tiger/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $sdf $strategoxt"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/compilers/tiger/default.nix b/pkgs/development/compilers/tiger/default.nix
index c7185fc659b72..2fd297b8848a5 100644
--- a/pkgs/development/compilers/tiger/default.nix
+++ b/pkgs/development/compilers/tiger/default.nix
@@ -1,12 +1,10 @@
-{stdenv, fetchurl, aterm, sdf, strategoxt}: derivation {
+{stdenv, fetchurl, aterm, sdf, strategoxt}: stdenv.mkDerivation {
   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;
diff --git a/pkgs/development/interpreters/j2re/builder.sh b/pkgs/development/interpreters/j2re/builder.sh
old mode 100755
new mode 100644
index 9e977f2a384e4..e14d911320b27
--- a/pkgs/development/interpreters/j2re/builder.sh
+++ b/pkgs/development/interpreters/j2re/builder.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . $stdenv/setup || exit 1
 version=j2re1.4.2_03
diff --git a/pkgs/development/interpreters/j2re/default.nix b/pkgs/development/interpreters/j2re/default.nix
index 170ac1bed4db6..3fa417657eac8 100644
--- a/pkgs/development/interpreters/j2re/default.nix
+++ b/pkgs/development/interpreters/j2re/default.nix
@@ -3,7 +3,6 @@
 if stdenv.system == "i686-linux"
   then
     (import ./j2re-sun-linux.nix) {
-      stdenv   = stdenv;
       fetchurl = fetchurl;
     }
   else
diff --git a/pkgs/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh
old mode 100755
new mode 100644
index e36e0738f501a..c1d35465d0b4d
--- a/pkgs/development/interpreters/perl/builder.sh
+++ b/pkgs/development/interpreters/perl/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$patch"
 . $stdenv/setup
 
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 26f44b9ef81c3..da3d53abe5f61 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchurl, patch}:
 
-derivation {
+stdenv.mkDerivation {
   name = "perl-5.8.3";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -19,5 +18,5 @@ derivation {
 
   srcPatch = ./patch;
 
-  inherit stdenv patch;
+  inherit patch;
 }
diff --git a/pkgs/development/interpreters/python/builder.sh b/pkgs/development/interpreters/python/builder.sh
old mode 100755
new mode 100644
index 9c57a580847f1..d7baadecdac8c
--- a/pkgs/development/interpreters/python/builder.sh
+++ b/pkgs/development/interpreters/python/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs=""
 if test -n "$zlibSupport"; then
   buildinputs="$zlib $buildinputs"
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 4d60896424e2c..e3e075dc0f151 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -2,14 +2,13 @@
 
 assert zlibSupport -> zlib != null;
 
-derivation {
+stdenv.mkDerivation {
   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;
+  inherit zlibSupport;
 }
diff --git a/pkgs/development/libraries/a52dec/builder.sh b/pkgs/development/libraries/a52dec/builder.sh
old mode 100755
new mode 100644
index 55367c159e38e..1899153fa34be
--- a/pkgs/development/libraries/a52dec/builder.sh
+++ b/pkgs/development/libraries/a52dec/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 5dbd14fb64ffc..20692fafb26af 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "a52dec-0.7.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
     md5 = "caa9f5bc44232dc8aeea773fea56be80";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/audiofile/builder.sh b/pkgs/development/libraries/audiofile/builder.sh
old mode 100755
new mode 100644
index f213ca74ebdb1..43db47a8b26c4
--- a/pkgs/development/libraries/audiofile/builder.sh
+++ b/pkgs/development/libraries/audiofile/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs=""
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index c39390666b435..7dc7b7c6c145f 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "audiofile-0.2.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.68k.org/~michael/audiofile/audiofile-0.2.5.tar.gz;
     md5 = "fd07c62a17ceafa317929e55e51e26c5";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
old mode 100755
new mode 100644
index f32e4ec50dd33..8b938d160fe84
--- a/pkgs/development/libraries/db4/builder.sh
+++ b/pkgs/development/libraries/db4/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/db4/default.nix b/pkgs/development/libraries/db4/default.nix
index cfe4a00efe6a9..9486ec8ba6dbd 100644
--- a/pkgs/development/libraries/db4/default.nix
+++ b/pkgs/development/libraries/db4/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "db4-4.2.52";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.sleepycat.com/update/snapshot/db-4.2.52.tar.gz;
     md5 = "cbc77517c9278cdb47613ce8cb55779f";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/expat/builder.sh b/pkgs/development/libraries/expat/builder.sh
old mode 100755
new mode 100644
index c5ca8edfb92f2..d425249cbc290
--- a/pkgs/development/libraries/expat/builder.sh
+++ b/pkgs/development/libraries/expat/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 77b025b739fdb..d033dfe719e12 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "expat-1.95.7";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz;
     md5 = "2ff59c2a5cbdd21a285c5f343e214fa9";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/fontconfig/builder.sh b/pkgs/development/libraries/fontconfig/builder.sh
old mode 100755
new mode 100644
index dc4243fadfecc..324d2d9f84372
--- a/pkgs/development/libraries/fontconfig/builder.sh
+++ b/pkgs/development/libraries/fontconfig/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$freetype $expat $x11 $ed"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index c9340043d90f8..16e13b7512599 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -5,15 +5,13 @@ assert freetype != null;
 assert expat != null;
 assert ed != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "fontconfig-2.2.90";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz;
     md5 = "5cb87476743be1bbf1674ed72a76ae6a";
   };
-  stdenv = stdenv;
   x11 = x11;
   freetype = freetype;
   expat = expat;
diff --git a/pkgs/development/libraries/freedesktop/libICE/builder.sh b/pkgs/development/libraries/freedesktop/libICE/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/freedesktop/libICE/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libICE/default.nix b/pkgs/development/libraries/freedesktop/libICE/default.nix
index 58dc8794c1809..6ff2e8519978f 100644
--- a/pkgs/development/libraries/freedesktop/libICE/default.nix
+++ b/pkgs/development/libraries/freedesktop/libICE/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libX11}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libICE-6.3.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2;
     md5 = "06db02e3df846b127a6e2dc3e345039c";
   };
   buildInputs = [pkgconfig libX11];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libSM/builder.sh b/pkgs/development/libraries/freedesktop/libSM/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/freedesktop/libSM/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/freedesktop/libSM/default.nix
index d60b03c1dac28..ed1765fa36395 100644
--- a/pkgs/development/libraries/freedesktop/libSM/default.nix
+++ b/pkgs/development/libraries/freedesktop/libSM/default.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchurl, pkgconfig, libX11, libICE}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libSM-6.0.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
@@ -10,5 +9,4 @@ derivation {
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [libX11 libICE];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libX11/builder.sh b/pkgs/development/libraries/freedesktop/libX11/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/freedesktop/libX11/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/freedesktop/libX11/default.nix
index dc95abe5102a2..69a6ea554ae83 100644
--- a/pkgs/development/libraries/freedesktop/libX11/default.nix
+++ b/pkgs/development/libraries/freedesktop/libX11/default.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchurl, pkgconfig, xproto, xextensions, libXtrans, libXau}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libX11-6.2.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
@@ -10,5 +9,4 @@ derivation {
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [xproto xextensions libXtrans libXau];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libXau/builder.sh b/pkgs/development/libraries/freedesktop/libXau/builder.sh
deleted file mode 100755
index dc844d758a83a..0000000000000
--- a/pkgs/development/libraries/freedesktop/libXau/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libXau/default.nix b/pkgs/development/libraries/freedesktop/libXau/default.nix
index be6d6e262c0aa..894f0d5a088f8 100644
--- a/pkgs/development/libraries/freedesktop/libXau/default.nix
+++ b/pkgs/development/libraries/freedesktop/libXau/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, pkgconfig, xproto}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libXau-0.1.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2;
     md5 = "3d747ada4a7d17538fa21c62d5608656";
   };
   buildInputs = [pkgconfig xproto];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libXt/builder.sh b/pkgs/development/libraries/freedesktop/libXt/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/freedesktop/libXt/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/freedesktop/libXt/default.nix
index 5d2e62c8c33f0..0645a18446ed9 100644
--- a/pkgs/development/libraries/freedesktop/libXt/default.nix
+++ b/pkgs/development/libraries/freedesktop/libXt/default.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchurl, pkgconfig, libX11, libSM, patch}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libXt-0.1.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2;
@@ -11,5 +10,4 @@ derivation {
   buildInputs = [pkgconfig libX11 libSM patch];
   # This patch should become unnecessary soon; already been fixed in CVS.
   patches = [./patch];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libXtrans/builder.sh b/pkgs/development/libraries/freedesktop/libXtrans/builder.sh
deleted file mode 100755
index dc844d758a83a..0000000000000
--- a/pkgs/development/libraries/freedesktop/libXtrans/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/libXtrans/default.nix b/pkgs/development/libraries/freedesktop/libXtrans/default.nix
index b5f9eb590b5bb..a706397e085a6 100644
--- a/pkgs/development/libraries/freedesktop/libXtrans/default.nix
+++ b/pkgs/development/libraries/freedesktop/libXtrans/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libXtrans-0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2;
     md5 = "a5ae4c7a75f930053b8327f7bd0c1361";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/xextensions/builder.sh b/pkgs/development/libraries/freedesktop/xextensions/builder.sh
deleted file mode 100755
index dc844d758a83a..0000000000000
--- a/pkgs/development/libraries/freedesktop/xextensions/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/xextensions/default.nix b/pkgs/development/libraries/freedesktop/xextensions/default.nix
index f22195154b983..eac4b89ab3f85 100644
--- a/pkgs/development/libraries/freedesktop/xextensions/default.nix
+++ b/pkgs/development/libraries/freedesktop/xextensions/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "xextensions-1.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2;
     md5 = "e61bca2a4757b736c9557dc8a7df2217";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/xlibs/builder.sh b/pkgs/development/libraries/freedesktop/xlibs/builder.sh
old mode 100755
new mode 100644
index f1230bed2d8a4..abcab635a6082
--- a/pkgs/development/libraries/freedesktop/xlibs/builder.sh
+++ b/pkgs/development/libraries/freedesktop/xlibs/builder.sh
@@ -1,4 +1,3 @@
-#! /bin/sh -e
 . $stdenv/setup
 dontMake=1
 dontMakeInstall=1
diff --git a/pkgs/development/libraries/freedesktop/xlibs/default.nix b/pkgs/development/libraries/freedesktop/xlibs/default.nix
index a5ef56ba46c7b..d1b7dc4476ce0 100644
--- a/pkgs/development/libraries/freedesktop/xlibs/default.nix
+++ b/pkgs/development/libraries/freedesktop/xlibs/default.nix
@@ -1,11 +1,9 @@
 {stdenv, libX11, libXt}:
 
-derivation {
+stdenv.mkDerivation {
   name = "xlib-1.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   propagatedBuildInputs = [libX11 libXt];
-  inherit stdenv;
 } // {
   # For compatability with XFree86.
   buildClientLibs = true;
diff --git a/pkgs/development/libraries/freedesktop/xproto/builder.sh b/pkgs/development/libraries/freedesktop/xproto/builder.sh
deleted file mode 100755
index dc844d758a83a..0000000000000
--- a/pkgs/development/libraries/freedesktop/xproto/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild
diff --git a/pkgs/development/libraries/freedesktop/xproto/default.nix b/pkgs/development/libraries/freedesktop/xproto/default.nix
index 008590ef43df1..6cfea9548025c 100644
--- a/pkgs/development/libraries/freedesktop/xproto/default.nix
+++ b/pkgs/development/libraries/freedesktop/xproto/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "xproto-6.6.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2;
     md5 = "8a7546a607dcd61b2ee595c763fd7f85";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freetype/builder.sh b/pkgs/development/libraries/freetype/builder.sh
old mode 100755
new mode 100644
index 81bd27e488200..724d378e62352
--- a/pkgs/development/libraries/freetype/builder.sh
+++ b/pkgs/development/libraries/freetype/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 4284979844d23..108874a3159f5 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "freetype-2.1.5";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.5.tar.bz2;
     md5 = "54537b518b84d04190a1eccd393a29df";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/gettext/builder.sh b/pkgs/development/libraries/gettext/builder.sh
old mode 100755
new mode 100644
index 57f18bb3da153..b91861bfa7f65
--- a/pkgs/development/libraries/gettext/builder.sh
+++ b/pkgs/development/libraries/gettext/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index d20c6f4763e8d..6cd64d2f69a7b 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gettext-0.12.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz;
     md5 = "5d4bddd300072315e668247e5b7d5bdb";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
old mode 100755
new mode 100644
index 29bcc7dc8e79e..398820c00383d
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 # glibc cannot have itself in its rpath.
 export NIX_NO_SELF_RPATH=1
 
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index c65281a7ce3af..90be37aefe662 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -2,9 +2,8 @@
 
 assert patch != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "glibc-2.3.2";
-  system = stdenv.system;
   builder = ./builder.sh;
 
   src = fetchurl {
@@ -21,5 +20,5 @@ derivation {
   patches = [./glibc-2.3.2-sscanf-1.patch];
 
   buildInputs = [patch];
-  inherit stdenv kernelHeaders;
+  inherit kernelHeaders;
 }
diff --git a/pkgs/development/libraries/gnet/builder.sh b/pkgs/development/libraries/gnet/builder.sh
old mode 100755
new mode 100644
index 220307fd8b95e..3590c5e23fb1d
--- a/pkgs/development/libraries/gnet/builder.sh
+++ b/pkgs/development/libraries/gnet/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $glib"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix
index cccf0e0d36c1c..ae6aadd42b28c 100644
--- a/pkgs/development/libraries/gnet/default.nix
+++ b/pkgs/development/libraries/gnet/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && glib != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "gnet-2.0.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz;
     md5 = "b43e728391143214e2cfd0b835b6fd2a";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   glib = glib;
 }
diff --git a/pkgs/development/libraries/gnome/GConf/builder.sh b/pkgs/development/libraries/gnome/GConf/builder.sh
old mode 100755
new mode 100644
index 814beb573617c..19d7bf711adf3
--- a/pkgs/development/libraries/gnome/GConf/builder.sh
+++ b/pkgs/development/libraries/gnome/GConf/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/development/libraries/gnome/GConf/default.nix
index 31f144b1d79d4..e6163c9f381eb 100644
--- a/pkgs/development/libraries/gnome/GConf/default.nix
+++ b/pkgs/development/libraries/gnome/GConf/default.nix
@@ -4,15 +4,13 @@ assert pkgconfig != null && perl != null
   && glib != null && gtk != null
   && libxml2 != null && ORBit2 != null && popt != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "GConf-2.4.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/GConf-2.4.0.1.tar.bz2;
     md5 = "2f7548d0bad24d7c4beba54d0ec98a20";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl; # Perl is not `supposed' to be required, but it is.
   glib = glib;
diff --git a/pkgs/development/libraries/gnome/ORBit2/builder.sh b/pkgs/development/libraries/gnome/ORBit2/builder.sh
old mode 100755
new mode 100644
index 87dbfe6cf9927..466ad2087e325
--- a/pkgs/development/libraries/gnome/ORBit2/builder.sh
+++ b/pkgs/development/libraries/gnome/ORBit2/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $glib $libIDL $popt"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/development/libraries/gnome/ORBit2/default.nix
index 8203db963ca90..d1fc483716b13 100644
--- a/pkgs/development/libraries/gnome/ORBit2/default.nix
+++ b/pkgs/development/libraries/gnome/ORBit2/default.nix
@@ -3,15 +3,13 @@
 assert pkgconfig != null && glib != null && libIDL != null
   && popt != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "ORBit2-2.8.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.8/ORBit2-2.8.3.tar.bz2;
     md5 = "c6c4b63de2f70310e33a52a37257ddaf";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   glib = glib;
   libIDL = libIDL;
diff --git a/pkgs/development/libraries/gnome/esound/builder.sh b/pkgs/development/libraries/gnome/esound/builder.sh
old mode 100755
new mode 100644
index bebb21cafdafd..a2c5cca65f3b0
--- a/pkgs/development/libraries/gnome/esound/builder.sh
+++ b/pkgs/development/libraries/gnome/esound/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$audiofile"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/development/libraries/gnome/esound/default.nix
index 7e51b9d6fba67..5dd792ef67cec 100644
--- a/pkgs/development/libraries/gnome/esound/default.nix
+++ b/pkgs/development/libraries/gnome/esound/default.nix
@@ -2,14 +2,12 @@
 
 assert audiofile != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "esound-0.2.32";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/esound-0.2.32.tar.bz2;
     md5 = "b2a5e71ec8220fea1c22cc042f5f6e63";
   };
-  stdenv = stdenv;
   audiofile = audiofile;
 }
diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh b/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh
old mode 100755
new mode 100644
index 46d023e04a376..60cd167a542f5
--- a/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh
+++ b/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $perl"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
index ffcd6d19a78cb..d523fd60c8659 100644
--- a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && perl != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "gnome-mime-data-2.4.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/gnome-mime-data-2.4.0.tar.bz2;
     md5 = "b8f1b383a23d734bec8bc33a03cb3690";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
 }
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
old mode 100755
new mode 100644
index 752464fe4ec88..e32024f2d1fd5
--- a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
+++ b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $perl $glib $libxml2 $GConf $libbonobo \
   $gnomemimedata $popt $bzip2"
 . $stdenv/setup || exit 1
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
index b2cd632f6ce70..39f0a83bfd43a 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
@@ -5,15 +5,13 @@ assert pkgconfig != null && perl != null && glib != null
   && libxml2 != null && GConf != null && libbonobo != null
   && gnomemimedata != null && bzip2 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "gnome-vfs-2.4.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.1.tar.bz2;
     md5 = "cb7a36076f6a65e40c7f540be3057310";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
   glib = glib;
diff --git a/pkgs/development/libraries/gnome/libIDL/builder.sh b/pkgs/development/libraries/gnome/libIDL/builder.sh
old mode 100755
new mode 100644
index 113dfef5a64fd..72b9bf8b0f2cc
--- a/pkgs/development/libraries/gnome/libIDL/builder.sh
+++ b/pkgs/development/libraries/gnome/libIDL/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $glib $lex $yacc"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/development/libraries/gnome/libIDL/default.nix
index e6ab1cb019b46..9d99b903978d2 100644
--- a/pkgs/development/libraries/gnome/libIDL/default.nix
+++ b/pkgs/development/libraries/gnome/libIDL/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && glib != null && lex != null && yacc != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libIDL-0.8.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2;
     md5 = "a75d2dbf3a3c66b567047c94245f8b82";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   glib = glib;
   lex = lex;
diff --git a/pkgs/development/libraries/gnome/libart_lgpl/builder.sh b/pkgs/development/libraries/gnome/libart_lgpl/builder.sh
old mode 100755
new mode 100644
index 61ebd1faa4ddc..1f4e7265a02da
--- a/pkgs/development/libraries/gnome/libart_lgpl/builder.sh
+++ b/pkgs/development/libraries/gnome/libart_lgpl/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs=""
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/development/libraries/gnome/libart_lgpl/default.nix
index 9241d3e2b96f1..23bb0d5dea863 100644
--- a/pkgs/development/libraries/gnome/libart_lgpl/default.nix
+++ b/pkgs/development/libraries/gnome/libart_lgpl/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "libart_lgpl-2.3.16";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libart_lgpl-2.3.16.tar.bz2;
     md5 = "6bb13292b00649d01400a5b29a6c87cb";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/gnome/libbonobo/builder.sh b/pkgs/development/libraries/gnome/libbonobo/builder.sh
old mode 100755
new mode 100644
index eb53f4f9648da..fb6ccb9677f98
--- a/pkgs/development/libraries/gnome/libbonobo/builder.sh
+++ b/pkgs/development/libraries/gnome/libbonobo/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $ORBit2 $libxml2 $popt $yacc $flex"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/development/libraries/gnome/libbonobo/default.nix
index c2a6adb9ecefe..b30a6ad6c84c3 100644
--- a/pkgs/development/libraries/gnome/libbonobo/default.nix
+++ b/pkgs/development/libraries/gnome/libbonobo/default.nix
@@ -3,15 +3,13 @@
 assert pkgconfig != null && perl != null && ORBit2 != null
   && libxml2 != null && popt != null && yacc != null && flex != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libbonobo-2.4.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/gnome/sources/libbonobo/2.4/libbonobo-2.4.2.tar.bz2;
     md5 = "78200cc6ed588c93f0d29177a5f3e003";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
   ORBit2 = ORBit2;
diff --git a/pkgs/development/libraries/gnome/libbonoboui/builder.sh b/pkgs/development/libraries/gnome/libbonoboui/builder.sh
old mode 100755
new mode 100644
index a014149835036..9f538ee1b873f
--- a/pkgs/development/libraries/gnome/libbonoboui/builder.sh
+++ b/pkgs/development/libraries/gnome/libbonoboui/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $libxml2 $libglade $libgnome \
   $libgnomecanvas"
 . $stdenv/setup
diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/development/libraries/gnome/libbonoboui/default.nix
index 3efa13fe151d2..bf700b7567713 100644
--- a/pkgs/development/libraries/gnome/libbonoboui/default.nix
+++ b/pkgs/development/libraries/gnome/libbonoboui/default.nix
@@ -4,15 +4,13 @@
 assert pkgconfig != null && perl != null && libxml2 != null
   && libglade != null && libgnome != null && libgnomecanvas != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libbonoboui-2.4.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libbonoboui-2.4.1.tar.bz2;
     md5 = "943a2d0e9fc7b9f0e97ba869de0c5f2a";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
   libxml2 = libxml2;
diff --git a/pkgs/development/libraries/gnome/libglade/builder.sh b/pkgs/development/libraries/gnome/libglade/builder.sh
old mode 100755
new mode 100644
index 9917fd2c5e92c..4c185c4c7a643
--- a/pkgs/development/libraries/gnome/libglade/builder.sh
+++ b/pkgs/development/libraries/gnome/libglade/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $gtk $libxml2"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/development/libraries/gnome/libglade/default.nix
index 543586eb20a5f..475bf9c9fa3aa 100644
--- a/pkgs/development/libraries/gnome/libglade/default.nix
+++ b/pkgs/development/libraries/gnome/libglade/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && gtk != null && libxml2 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libglade-2.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libglade-2.0.1.tar.bz2;
     md5 = "4d93f6b01510013ae429e91af432cfe2";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gtk = gtk;
   libxml2 = libxml2;
diff --git a/pkgs/development/libraries/gnome/libgnome/builder.sh b/pkgs/development/libraries/gnome/libgnome/builder.sh
old mode 100755
new mode 100644
index 30de2db56cdb3..bd32300351c12
--- a/pkgs/development/libraries/gnome/libgnome/builder.sh
+++ b/pkgs/development/libraries/gnome/libgnome/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $glib $gnomevfs $libbonobo $GConf \
   $popt $zlib"
 . $stdenv/setup
diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix
index d33a54cf7a285..ac4a61365e881 100644
--- a/pkgs/development/libraries/gnome/libgnome/default.nix
+++ b/pkgs/development/libraries/gnome/libgnome/default.nix
@@ -10,15 +10,13 @@ assert pkgconfig != null && perl != null && glib != null
 # "WARNING: failed to install schema `/schemas/desktop/gnome/url-handlers/https/need-terminal' locale `is': Failed:
 # Failed to create file `/nix/store/14d4fc76451786eba9dea087d56dc719-GConf-2.4.0/etc/gconf/gconf.xml.defaults/%gconf.xml': Permission denied"
 
-derivation {
+stdenv.mkDerivation {
   name = "libgnome-2.0.6";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/gnome/sources/libgnome/2.4/libgnome-2.4.0.tar.bz2;
     md5 = "caec1e12d64b98a2925a4317ac16429f";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
   glib = glib;
diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh
old mode 100755
new mode 100644
index 550ee65a8d0ab..c7eddf4ffa91d
--- a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh
+++ b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $gtk $libart $libglade"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
index fef31114b1b8e..878a5936a3cf4 100644
--- a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
+++ b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix
@@ -3,15 +3,13 @@
 assert pkgconfig != null && gtk != null && libart != null
   && libglade != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libgnomecanvas-2.4.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomecanvas-2.4.0.tar.bz2;
     md5 = "c212a7cac06b7f9e68ed2de38df6e54d";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gtk = gtk;
   libart = libart;
diff --git a/pkgs/development/libraries/gnome/libgnomeui/builder.sh b/pkgs/development/libraries/gnome/libgnomeui/builder.sh
old mode 100755
new mode 100644
index 23711d9ea6f5b..c0ccfec36ef43
--- a/pkgs/development/libraries/gnome/libgnomeui/builder.sh
+++ b/pkgs/development/libraries/gnome/libgnomeui/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $libgnome $libgnomecanvas $libbonoboui $libglade"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/development/libraries/gnome/libgnomeui/default.nix
index 9a97d7697a951..a44d8bb6a99d8 100644
--- a/pkgs/development/libraries/gnome/libgnomeui/default.nix
+++ b/pkgs/development/libraries/gnome/libgnomeui/default.nix
@@ -3,15 +3,13 @@
 assert pkgconfig != null && libgnome != null && libgnomecanvas != null
   && libbonoboui != null && libglade != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libgnomeui-2.4.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomeui-2.4.0.1.tar.bz2;
     md5 = "196f4a3f1f4a531ff57acaa879e98dd2";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   libgnome = libgnome;
   libgnomecanvas = libgnomecanvas;
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
index dbf194171c93d..d0654900f0287 100644
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
@@ -3,9 +3,8 @@
 assert gtk != null && libtiff != null
   && libjpeg != null && libpng != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "gdk-pixbuf-0.22.0";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -14,5 +13,4 @@ derivation {
   };
 
   buildInputs = [gtk libtiff libjpeg libpng];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/gtk+-1/glib/builder.sh b/pkgs/development/libraries/gtk+-1/glib/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/gtk+-1/glib/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/gtk+-1/glib/default.nix b/pkgs/development/libraries/gtk+-1/glib/default.nix
index eb61048c3af71..f8bb0f0e7824a 100644
--- a/pkgs/development/libraries/gtk+-1/glib/default.nix
+++ b/pkgs/development/libraries/gtk+-1/glib/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "glib-1.2.10";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
     md5 = "6fe30dad87c77b91b632def29dd69ef9";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
old mode 100755
new mode 100644
index 3f0cb5a150528..9c1af29b65e5a
--- a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
+++ b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
@@ -1,4 +1,3 @@
-#! /bin/sh -e
 . $stdenv/setup
 genericBuild
 
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/default.nix b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
index 7ee815ec5f68d..7762ee57b77e4 100644
--- a/pkgs/development/libraries/gtk+-1/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
@@ -3,9 +3,8 @@
 assert x11 != null && glib != null;
 assert x11.buildClientLibs;
 
-derivation {
+stdenv.mkDerivation {
   name = "gtk+-1.2.10";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -15,5 +14,4 @@ derivation {
 
   buildInputs = [x11 glib];
   _propagatedBuildInputs = [x11 glib];
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/gtk+/atk/builder.sh b/pkgs/development/libraries/gtk+/atk/builder.sh
old mode 100755
new mode 100644
index be57a268c124f..a5af70b675ae1
--- a/pkgs/development/libraries/gtk+/atk/builder.sh
+++ b/pkgs/development/libraries/gtk+/atk/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $glib"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gtk+/atk/default.nix b/pkgs/development/libraries/gtk+/atk/default.nix
index 7d45fbca050e3..f08c561676fe8 100644
--- a/pkgs/development/libraries/gtk+/atk/default.nix
+++ b/pkgs/development/libraries/gtk+/atk/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && glib != null && perl != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "atk-1.2.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
     md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   glib = glib;
   perl = perl;
diff --git a/pkgs/development/libraries/gtk+/glib/builder.sh b/pkgs/development/libraries/gtk+/glib/builder.sh
old mode 100755
new mode 100644
index 8f4c0b097b21c..5f12963eb8bea
--- a/pkgs/development/libraries/gtk+/glib/builder.sh
+++ b/pkgs/development/libraries/gtk+/glib/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $gettext $perl"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/gtk+/glib/default.nix b/pkgs/development/libraries/gtk+/glib/default.nix
index 88bb12593735f..83700be486338 100644
--- a/pkgs/development/libraries/gtk+/glib/default.nix
+++ b/pkgs/development/libraries/gtk+/glib/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && gettext != null && perl != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "glib-2.2.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
     md5 = "aa214a10d873b68ddd67cd9de2ccae55";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gettext = gettext;
   perl = perl;
diff --git a/pkgs/development/libraries/gtk+/gtk+/builder.sh b/pkgs/development/libraries/gtk+/gtk+/builder.sh
old mode 100755
new mode 100644
index 0b444c1f0093f..38659aa31c250
--- a/pkgs/development/libraries/gtk+/gtk+/builder.sh
+++ b/pkgs/development/libraries/gtk+/gtk+/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $x11 $glib $atk $pango $perl $libtiff $libjpeg $libpng"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gtk+/gtk+/default.nix b/pkgs/development/libraries/gtk+/gtk+/default.nix
index 1437221c813c9..0efb546b107b6 100644
--- a/pkgs/development/libraries/gtk+/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk+/gtk+/default.nix
@@ -9,15 +9,13 @@ assert glib == atk.glib;
 assert glib == pango.glib;
 assert x11 == pango.x11;
 
-derivation {
+stdenv.mkDerivation {
   name = "gtk+-2.2.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
     md5 = "605332199533e73bc6eec481fb4f1671";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   x11 = x11;
   glib = glib;
diff --git a/pkgs/development/libraries/gtk+/pango/builder.sh b/pkgs/development/libraries/gtk+/pango/builder.sh
old mode 100755
new mode 100644
index 6242083508d82..0ec40bf7b4063
--- a/pkgs/development/libraries/gtk+/pango/builder.sh
+++ b/pkgs/development/libraries/gtk+/pango/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $x11 $glib $xft"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gtk+/pango/default.nix b/pkgs/development/libraries/gtk+/pango/default.nix
index 36731123e56f8..36d204a5e6d06 100644
--- a/pkgs/development/libraries/gtk+/pango/default.nix
+++ b/pkgs/development/libraries/gtk+/pango/default.nix
@@ -4,15 +4,13 @@ assert pkgconfig != null && x11 != null && glib != null && xft != null;
 assert x11.buildClientLibs;
 assert xft.x11 == x11;
 
-derivation {
+stdenv.mkDerivation {
   name = "pango-1.2.5";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
     md5 = "df00fe3e71cd297010f24f439b6c8ee6";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   x11 = x11;
   glib = glib;
diff --git a/pkgs/development/libraries/libdvdcss/builder.sh b/pkgs/development/libraries/libdvdcss/builder.sh
old mode 100755
new mode 100644
index 6d7015b1054c9..c7bd41840bb1a
--- a/pkgs/development/libraries/libdvdcss/builder.sh
+++ b/pkgs/development/libraries/libdvdcss/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 8745bd546862f..fe51ca0bb1f3d 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "libdvdcss-1.2.8";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdcss-1.2.8.tar.gz;
     md5 = "e35e4240b6ca0b66a0218065dffe6adb";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/libdvdplay/builder.sh b/pkgs/development/libraries/libdvdplay/builder.sh
old mode 100755
new mode 100644
index 6b2b5132304c7..686288592b3cd
--- a/pkgs/development/libraries/libdvdplay/builder.sh
+++ b/pkgs/development/libraries/libdvdplay/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$libdvdread"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix
index 7c4d67dbb021a..820d9df2f8a4b 100644
--- a/pkgs/development/libraries/libdvdplay/default.nix
+++ b/pkgs/development/libraries/libdvdplay/default.nix
@@ -2,14 +2,12 @@
 
 assert libdvdread != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libdvdplay-1.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/libdvdplay/1.0.1/libdvdplay-1.0.1.tar.bz2;
     md5 = "602bca4ef78d79aa87e5e8920d958a78";
   };
-  stdenv = stdenv;
   libdvdread = libdvdread;
 }
diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh
old mode 100755
new mode 100644
index 4ecafb3a06968..1581116ce53ff
--- a/pkgs/development/libraries/libdvdread/builder.sh
+++ b/pkgs/development/libraries/libdvdread/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$libdvdcss"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 11da28b6f8544..926180384d1ef 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,14 +2,12 @@
 
 assert libdvdcss != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libdvdread-20030812";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2;
     md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
   };
-  stdenv = stdenv;
   libdvdcss = libdvdcss;
 }
diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh
old mode 100755
new mode 100644
index 9a27a8545c45d..16a3d377f17d6
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/pkgs/development/libraries/libjpeg/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 80946833f721a..8b6d44e1c9dcd 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "libjpeg-6b";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
     md5 = "dbd5f3b47ed13132f04c685d608a7547";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/libmad/builder.sh b/pkgs/development/libraries/libmad/builder.sh
old mode 100755
new mode 100644
index 27e135bf7ee1a..b6a916f74b642
--- a/pkgs/development/libraries/libmad/builder.sh
+++ b/pkgs/development/libraries/libmad/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 38f229e44e501..a7441fbe6f223 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "libmad-0.15.0b";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/mad/libmad-0.15.0b.tar.gz;
     md5 = "2e4487cdf922a6da2546bad74f643205";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/libpng/builder.sh b/pkgs/development/libraries/libpng/builder.sh
old mode 100755
new mode 100644
index 24b847b598604..515c3828ca1b6
--- a/pkgs/development/libraries/libpng/builder.sh
+++ b/pkgs/development/libraries/libpng/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildInputs="$zlib"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 5e0d65dc02ea6..cb651485b69d9 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -2,14 +2,12 @@
 
 assert zlib != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libpng-1.2.5";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2;
     md5 = "3fc28af730f12ace49b14568de4ad934";
   };
-  stdenv = stdenv;
   zlib = zlib;
 }
diff --git a/pkgs/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh
old mode 100755
new mode 100644
index 59fa97888e9c7..b26eba9c56687
--- a/pkgs/development/libraries/libtiff/builder.sh
+++ b/pkgs/development/libraries/libtiff/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$zlib $libjpeg"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 7b16f5f067ce5..4cfe16e485c54 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -2,15 +2,13 @@
 
 assert zlib != null && libjpeg != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libtiff-3.5.7";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz;
     md5 = "82243b5ae9b7c9e492aeebc501680990";
   };
-  stdenv = stdenv;
   zlib = zlib;
   libjpeg = libjpeg;
 }
diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh
old mode 100755
new mode 100644
index d787dee7071ad..da5a450ffb8e7
--- a/pkgs/development/libraries/libxml2/builder.sh
+++ b/pkgs/development/libraries/libxml2/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$zlib"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 7533451029e3a..8e218a4dd72be 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -2,14 +2,12 @@
 
 assert zlib != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libxml2-2.6.7";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.7.tar.bz2;
     md5 = "bdbef92cbdc5b4bd0365313ba22b75ce";
   };
-  stdenv = stdenv;
   zlib = zlib;
 }
diff --git a/pkgs/development/libraries/libxslt/builder.sh b/pkgs/development/libraries/libxslt/builder.sh
old mode 100755
new mode 100644
index 70521de25cf86..e5cc0f5a66747
--- a/pkgs/development/libraries/libxslt/builder.sh
+++ b/pkgs/development/libraries/libxslt/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$libxml2"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index b005aca4aaf9c..523d6cf9fd2c7 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -2,14 +2,12 @@
 
 assert libxml2 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libxslt-1.1.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://xmlsoft.org/libxslt-1.1.0.tar.gz;
     md5 = "79a2c5307812e813e14f18b6fef9ca87";
   };
-  stdenv = stdenv;
   libxml2 = libxml2;
 }
diff --git a/pkgs/development/libraries/mpeg2dec/builder.sh b/pkgs/development/libraries/mpeg2dec/builder.sh
old mode 100755
new mode 100644
index 22fd9594af029..6dc6a220e9246
--- a/pkgs/development/libraries/mpeg2dec/builder.sh
+++ b/pkgs/development/libraries/mpeg2dec/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/libraries/mpeg2dec/default.nix b/pkgs/development/libraries/mpeg2dec/default.nix
index 1b4da9bc2ce8a..a57314a3fddd4 100644
--- a/pkgs/development/libraries/mpeg2dec/default.nix
+++ b/pkgs/development/libraries/mpeg2dec/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "mpeg2dec-20030612";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0.tar.gz;
     md5 = "49a70fef1b0f710ed7e64ed32ee82d4d";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/libraries/ncurses/builder.sh b/pkgs/development/libraries/ncurses/builder.sh
old mode 100755
new mode 100644
index 3738256e5d075..23091ee306ce8
--- a/pkgs/development/libraries/ncurses/builder.sh
+++ b/pkgs/development/libraries/ncurses/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs=""
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 41eac6d2dd02a..9f52fe66286cc 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "ncurses-5.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.4.tar.gz;
     md5 = "069c8880072060373290a4fefff43520";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh
old mode 100755
new mode 100644
index c1493365ae6cc..596a80cd37133
--- a/pkgs/development/libraries/openssl/builder.sh
+++ b/pkgs/development/libraries/openssl/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 export PATH=$perl/bin:$PATH
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5a8fb164028a7..4ca67d3f5d43d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,10 +1,9 @@
-{stdenv, fetchurl, perl}: derivation {
+{stdenv, fetchurl, perl}: stdenv.mkDerivation {
   name = "openssl-0.9.7d";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.openssl.org/source/openssl-0.9.7d.tar.gz;
     md5 = "1b49e90fc8a75c3a507c0a624529aca5";
   };
-  inherit stdenv perl;
+  inherit perl;
 }
diff --git a/pkgs/development/libraries/pcre/builder.sh b/pkgs/development/libraries/pcre/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/libraries/pcre/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 5b98a264e3ca2..9c5e3c67282b9 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "pcre-4.3";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.3.tar.bz2;
     md5 = "7bc7d5b590a41e6f9ede30f272002a02";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/popt/builder.sh b/pkgs/development/libraries/popt/builder.sh
old mode 100755
new mode 100644
index 62100048d0a93..851e010f03820
--- a/pkgs/development/libraries/popt/builder.sh
+++ b/pkgs/development/libraries/popt/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$gettext"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 7ad1cb807b7c2..4383b8486ef7f 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -2,14 +2,12 @@
 
 assert gettext != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "popt-1.7";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz;
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
-  stdenv = stdenv;
   gettext = gettext;
 }
diff --git a/pkgs/development/libraries/rna/builder.sh b/pkgs/development/libraries/rna/builder.sh
old mode 100755
new mode 100644
index 60ac15542e5b3..1b427b7915623
--- a/pkgs/development/libraries/rna/builder.sh
+++ b/pkgs/development/libraries/rna/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$zlib"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/rna/default.nix b/pkgs/development/libraries/rna/default.nix
index 81319bcaff258..a71b91a3368c4 100644
--- a/pkgs/development/libraries/rna/default.nix
+++ b/pkgs/development/libraries/rna/default.nix
@@ -2,13 +2,12 @@
 
 assert zlib != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "rna-0.14c";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.radionetworkprocessor.com/pub/radionetworkprocessor/rna-0.14c.tar.gz;
     md5 = "1e2947caf8a680e93cac55bffe2d6ec6";
   };
-  inherit stdenv zlib;
+  inherit zlib;
 }
diff --git a/pkgs/development/libraries/scrollkeeper/builder.sh b/pkgs/development/libraries/scrollkeeper/builder.sh
old mode 100755
new mode 100644
index 4dc559c62286c..eeb2371aaac2f
--- a/pkgs/development/libraries/scrollkeeper/builder.sh
+++ b/pkgs/development/libraries/scrollkeeper/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $libxml2 $libxslt"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/scrollkeeper/default.nix b/pkgs/development/libraries/scrollkeeper/default.nix
index 38e7c73e94464..1e80b1367ff97 100644
--- a/pkgs/development/libraries/scrollkeeper/default.nix
+++ b/pkgs/development/libraries/scrollkeeper/default.nix
@@ -6,15 +6,13 @@ assert perl != null && libxml2 != null && libxslt != null
 
 # !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH
 
-derivation {
+stdenv.mkDerivation {
   name = "scrollkeeper-0.3.14";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/scrollkeeper/scrollkeeper-0.3.14.tar.gz;
     md5 = "161eb3f29e30e7b24f84eb93ac696155";
   };
-  stdenv = stdenv;
   perl = perl;
   libxml2 = libxml2;
   libxslt = libxslt;
diff --git a/pkgs/development/libraries/wxGTK/builder.sh b/pkgs/development/libraries/wxGTK/builder.sh
old mode 100755
new mode 100644
index 64e4a5ff832d1..d2b0880add936
--- a/pkgs/development/libraries/wxGTK/builder.sh
+++ b/pkgs/development/libraries/wxGTK/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/wxGTK/default.nix b/pkgs/development/libraries/wxGTK/default.nix
index 039579c2d543a..27bfcf2ebff9c 100644
--- a/pkgs/development/libraries/wxGTK/default.nix
+++ b/pkgs/development/libraries/wxGTK/default.nix
@@ -6,9 +6,8 @@ assert gtk.libjpeg != null;
 assert gtk.libpng != null;
 assert gtk.libpng.zlib != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "wxGTK-2.4.2";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -20,5 +19,5 @@ derivation {
   libjpeg = gtk.libjpeg;
   libpng = gtk.libpng;
   zlib = gtk.libpng.zlib;
-  inherit stdenv pkgconfig gtk compat22;
+  inherit pkgconfig gtk compat22;
 }
diff --git a/pkgs/development/libraries/xft/builder.sh b/pkgs/development/libraries/xft/builder.sh
old mode 100755
new mode 100644
index 085974877deb3..4ed7d6e918a58
--- a/pkgs/development/libraries/xft/builder.sh
+++ b/pkgs/development/libraries/xft/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 set -x
 
 buildinputs="$pkgconfig $fontconfig $x11"
diff --git a/pkgs/development/libraries/xft/default.nix b/pkgs/development/libraries/xft/default.nix
index ea1cef2cfe6d6..69aef8a76059d 100644
--- a/pkgs/development/libraries/xft/default.nix
+++ b/pkgs/development/libraries/xft/default.nix
@@ -3,15 +3,13 @@
 assert pkgconfig != null && x11 != null && fontconfig != null;
 assert fontconfig.x11 == x11;
 
-derivation {
+stdenv.mkDerivation {
   name = "xft-2.1.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz;
     md5 = "defb7e801d4938b8b15a426ae57e2f3f";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   x11 = x11;
   fontconfig = fontconfig;
diff --git a/pkgs/development/libraries/zlib/builder.sh b/pkgs/development/libraries/zlib/builder.sh
deleted file mode 100755
index b8e06a6907f9b..0000000000000
--- a/pkgs/development/libraries/zlib/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-configureFlags="--shared"
-genericBuild
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index c5889e57fb4aa..6dec5bac1fe83 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "zlib-1.2.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.gzip.org/zlib/zlib-1.2.1.tar.gz;
     md5 = "ef1cb003448b4a53517b8f25adb12452";
   };
-  inherit stdenv;
+  configureFlags = "--shared";
 }
diff --git a/pkgs/development/libraries/zvbi/builder.sh b/pkgs/development/libraries/zvbi/builder.sh
old mode 100755
new mode 100644
index a123b16dce28c..379ad847fae51
--- a/pkgs/development/libraries/zvbi/builder.sh
+++ b/pkgs/development/libraries/zvbi/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$x11 $libpng"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index 54de0c92816a5..6ba67e642234e 100644
--- a/pkgs/development/libraries/zvbi/default.nix
+++ b/pkgs/development/libraries/zvbi/default.nix
@@ -4,15 +4,13 @@
 assert x11 != null;
 assert pngSupport -> libpng != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "zvbi-0.2.5";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.5.tar.bz2;
     md5 = "06b370565246758813f6580797369518";
   };
-  stdenv = stdenv;
   x11 = x11;
   pngSupport = pngSupport;
   libpng = if pngSupport then libpng else null;
diff --git a/pkgs/development/perl-modules/BerkeleyDB/builder.sh b/pkgs/development/perl-modules/BerkeleyDB/builder.sh
old mode 100755
new mode 100644
index ebe916c738e8d..e14e8c4311ac5
--- a/pkgs/development/perl-modules/BerkeleyDB/builder.sh
+++ b/pkgs/development/perl-modules/BerkeleyDB/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $db4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 8dd44e1e201ca..b4cf9f10438fa 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -2,15 +2,13 @@
 
 assert perl != null && db4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "perl-BerkeleyDB-0.25";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.25.tar.gz;
     md5 = "fcef06232d1ccd6c2a9cd114e388ea3d";
   };
-  stdenv = stdenv;
   perl = perl;
   db4 = db4;
 }
diff --git a/pkgs/development/perl-modules/XML-Parser/builder.sh b/pkgs/development/perl-modules/XML-Parser/builder.sh
old mode 100755
new mode 100644
index 3b5d98eebba05..b6409cd87651b
--- a/pkgs/development/perl-modules/XML-Parser/builder.sh
+++ b/pkgs/development/perl-modules/XML-Parser/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $expat"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/perl-modules/XML-Parser/default.nix b/pkgs/development/perl-modules/XML-Parser/default.nix
index 79bad03171eca..3f41b6327035c 100644
--- a/pkgs/development/perl-modules/XML-Parser/default.nix
+++ b/pkgs/development/perl-modules/XML-Parser/default.nix
@@ -2,15 +2,13 @@
 
 assert perl != null && expat != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "perl-XML-Parser-2.34";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz;
     md5 = "84d9e0001fe01c14867256c3fe115899";
   };
-  stdenv = stdenv;
   perl = perl;
   expat = expat;
 }
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh
old mode 100755
new mode 100644
index dafbc9038637b..3e36d3f404535
--- a/pkgs/development/python-modules/wxPython/builder.sh
+++ b/pkgs/development/python-modules/wxPython/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$wxGTK $python $pkgconfig $gtk"
 . $stdenv/setup
 
diff --git a/pkgs/development/python-modules/wxPython/default.nix b/pkgs/development/python-modules/wxPython/default.nix
index 0cd19b9fe034a..65dda5e5671d5 100644
--- a/pkgs/development/python-modules/wxPython/default.nix
+++ b/pkgs/development/python-modules/wxPython/default.nix
@@ -2,9 +2,8 @@
 
 assert wxGTK.compat22;
 
-derivation {
+stdenv.mkDerivation {
   name = "wxPython-2.4.2.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz;
@@ -12,5 +11,5 @@ derivation {
   };
   pkgconfig = wxGTK.pkgconfig;
   gtk = wxGTK.gtk;
-  inherit stdenv wxGTK python;
+  inherit wxGTK python;
 }
diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh
old mode 100755
new mode 100644
index 4478233712bf9..e3e8e63d73d92
--- a/pkgs/development/tools/build-managers/apache-ant/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 52b5f9b524ba0..e7c587136a7a4 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,10 +1,8 @@
-{stdenv, fetchurl, j2sdk}: derivation {
+{stdenv, fetchurl, j2sdk}: stdenv.mkDerivation {
   name = "apache-ant-1.6.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://dist.apache.easynet.nl/ant/binaries/apache-ant-1.6.0-bin.tar.bz2;
     md5 = "01989c306da53862c101d9ea4ebb1f00";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/tools/build-managers/gnumake/builder.sh b/pkgs/development/tools/build-managers/gnumake/builder.sh
deleted file mode 100755
index a73f5a6d5b8dc..0000000000000
--- a/pkgs/development/tools/build-managers/gnumake/builder.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix
index de0bd9c901d45..0b7a044f258e9 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
@@ -1,14 +1,11 @@
 {stdenv, fetchurl, patch}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gnumake-3.80";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2;
     md5 = "0bbd1df101bc0294d440471e50feca71";
   };
   patches = [./log.diff];
   buildInputs = [patch];
-  inherit stdenv;
 }
diff --git a/pkgs/development/tools/misc/autoconf/builder.sh b/pkgs/development/tools/misc/autoconf/builder.sh
old mode 100755
new mode 100644
index e421c69a6c27e..de4db475aaac9
--- a/pkgs/development/tools/misc/autoconf/builder.sh
+++ b/pkgs/development/tools/misc/autoconf/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$m4 $perl"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index f7ea5d44c5763..c850d1fb8fecb 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, m4, perl}:
-derivation {
+stdenv.mkDerivation {
   name = "autoconf-2.58";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2;
     md5 = "db3fa3069c6554b3505799c7e1022e2b";
   };
-  stdenv = stdenv;
   m4 = m4;
   perl = perl;
 }
diff --git a/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh
old mode 100755
new mode 100644
diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh
old mode 100755
new mode 100644
index b356da4236515..6610efa72052b
--- a/pkgs/development/tools/misc/automake/builder.sh
+++ b/pkgs/development/tools/misc/automake/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $autoconf"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/misc/automake/default.nix b/pkgs/development/tools/misc/automake/default.nix
index 219ed9c89e202..3daa1708d4f5d 100644
--- a/pkgs/development/tools/misc/automake/default.nix
+++ b/pkgs/development/tools/misc/automake/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, perl, autoconf}:
-derivation {
+stdenv.mkDerivation {
   name = "automake-1.7.9";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.7.9.tar.bz2;
     md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
   };
-  stdenv = stdenv;
   perl = perl;
   autoconf = autoconf;
 }
diff --git a/pkgs/development/tools/misc/binutils/builder.sh b/pkgs/development/tools/misc/binutils/builder.sh
old mode 100755
new mode 100644
index 409cd4bba8c46..ac8b7f13a790d
--- a/pkgs/development/tools/misc/binutils/builder.sh
+++ b/pkgs/development/tools/misc/binutils/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 patchConfigure() {
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 5208abef63798..014eb72dd9293 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,12 +1,11 @@
 {stdenv, fetchurl, noSysDirs}:
 
-derivation {
+stdenv.mkDerivation {
   name = "binutils-2.14";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nl.net/pub/gnu/binutils/binutils-2.14.tar.bz2;
     md5 = "2da8def15d28af3ec6af0982709ae90a";
   };
-  inherit stdenv noSysDirs;
+  inherit noSysDirs;
 }
diff --git a/pkgs/development/tools/misc/gnum4/builder.sh b/pkgs/development/tools/misc/gnum4/builder.sh
old mode 100755
new mode 100644
index 03f201582bb7d..de2631e715671
--- a/pkgs/development/tools/misc/gnum4/builder.sh
+++ b/pkgs/development/tools/misc/gnum4/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 25d095d387a06..408c97a3563d6 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,11 +1,9 @@
 {stdenv, fetchurl}:
-derivation {
+stdenv.mkDerivation {
   name = "gnum4-1.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz;
     md5 = "9eb2dd07740b2d2f3c7adb3e8d299bda";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/tools/misc/gperf/builder.sh b/pkgs/development/tools/misc/gperf/builder.sh
old mode 100755
new mode 100644
index 8eee4233a9451..08e18c2681d46
--- a/pkgs/development/tools/misc/gperf/builder.sh
+++ b/pkgs/development/tools/misc/gperf/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 tar xvfz $src
diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index cc0f3e317d69b..ded80edca8371 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gperf-2.7.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnu.org/gnu/gperf/gperf-2.7.2.tar.gz;
     md5 = "e501acc2e18eed2c8f25ca0ac2330d68";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/tools/misc/libtool/builder.sh b/pkgs/development/tools/misc/libtool/builder.sh
old mode 100755
new mode 100644
index eaa673874ae50..4b8407fb533ec
--- a/pkgs/development/tools/misc/libtool/builder.sh
+++ b/pkgs/development/tools/misc/libtool/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$m4 $perl"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
index febe579a7c73d..e02658af93a09 100644
--- a/pkgs/development/tools/misc/libtool/default.nix
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, m4, perl}:
-derivation {
+stdenv.mkDerivation {
   name = "libtool-1.5";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz;
     md5 = "0e1844f25e2ad74c3715b5776d017545";
   };
-  stdenv = stdenv;
   m4 = m4;
   perl = perl;
 }
diff --git a/pkgs/development/tools/misc/octavefront/builder.sh b/pkgs/development/tools/misc/octavefront/builder.sh
old mode 100755
new mode 100644
index c24c9d1b123d8..16f41eacdc1f0
--- a/pkgs/development/tools/misc/octavefront/builder.sh
+++ b/pkgs/development/tools/misc/octavefront/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 set -x
 
 buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf $rna $aterm"
diff --git a/pkgs/development/tools/misc/octavefront/default.nix b/pkgs/development/tools/misc/octavefront/default.nix
index 7fdc5b93c72ca..f68b9bb121848 100644
--- a/pkgs/development/tools/misc/octavefront/default.nix
+++ b/pkgs/development/tools/misc/octavefront/default.nix
@@ -7,13 +7,12 @@ assert autoconf != null && texinfo != null
   && rna != null && aterm != null;
 assert g77.langF77;
 
-derivation {
+stdenv.mkDerivation {
   name = "octavefront-0.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.radionetworkprocessor.com/pub/radionetworkprocessor/octavefront-0.2.tar.gz;
     md5 = "14e02d060fd6afc6752dbba0a7445ff2";
   };
-  inherit stdenv autoconf g77 texinfo bison flex gperf rna aterm;
+  inherit autoconf g77 texinfo bison flex gperf rna aterm;
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh
old mode 100755
new mode 100644
index b2b351301626f..c48fd9dbeb1e6
--- a/pkgs/development/tools/misc/pkgconfig/builder.sh
+++ b/pkgs/development/tools/misc/pkgconfig/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup
 
 tar xvfz $src
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 4cd880aad0069..0dae1094666af 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "pkgconfig-0.15.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
     url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz;
     md5 = "a7e4f60a6657dbc434334deb594cc242";
   };
-  inherit stdenv;
 }
diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh
old mode 100755
new mode 100644
index 25a5040e45d64..10d96cbea53ca
--- a/pkgs/development/tools/misc/swig/builder.sh
+++ b/pkgs/development/tools/misc/swig/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $python"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index a84ad4fc1f350..d0dd0a8cd3d74 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -4,9 +4,8 @@
 assert perlSupport -> perl != null;
 assert pythonSupport -> python != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "swig-1.3.19";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -17,7 +16,6 @@ derivation {
   perlSupport = perlSupport;
   pythonSupport = pythonSupport;
 
-  stdenv = stdenv;
   perl = if perlSupport then perl else null;
   python = if pythonSupport then python else null;
 }
\ No newline at end of file
diff --git a/pkgs/development/tools/misc/texinfo/builder.sh b/pkgs/development/tools/misc/texinfo/builder.sh
old mode 100755
new mode 100644
index 81a30f02d8a02..0a24647bf81c6
--- a/pkgs/development/tools/misc/texinfo/builder.sh
+++ b/pkgs/development/tools/misc/texinfo/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$ncurses"
 . $stdenv/setup
 
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index 960bb6107f8f7..d97f8ffbbe1ce 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -2,13 +2,12 @@
 
 assert ncurses != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "texinfo-4.6";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.6.tar.gz;
     md5 = "5730c8c0c7484494cca7a7e2d7459c64";
   };
-  inherit stdenv ncurses;
+  inherit ncurses;
 }
diff --git a/pkgs/development/tools/misc/valgrind/builder.sh b/pkgs/development/tools/misc/valgrind/builder.sh
old mode 100755
new mode 100644
index ec568b79a183c..a3066cf635266
--- a/pkgs/development/tools/misc/valgrind/builder.sh
+++ b/pkgs/development/tools/misc/valgrind/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 # !!! hack; this is because $linuxHeaders/config.h includes some
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 772479d601fef..7b46fc183a61e 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "valgrind-2.1.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://developer.kde.org/~sewardj/valgrind-2.1.0.tar.bz2;
     md5 = "3e4056dd45163a5f555a23ced2f95191";
   };
-  stdenv = stdenv;
 }
diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh
index 8170bbbea018b..ee69b7b635601 100644
--- a/pkgs/development/tools/parsing/asc-support/builder.sh
+++ b/pkgs/development/tools/parsing/asc-support/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $ptsupport $toolbuslib $asfsupport"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/asf-support/builder.sh b/pkgs/development/tools/parsing/asf-support/builder.sh
old mode 100755
new mode 100644
index f7e3f7347af9a..58f73d15f8994
--- a/pkgs/development/tools/parsing/asf-support/builder.sh
+++ b/pkgs/development/tools/parsing/asf-support/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $ptsupport"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/bison/builder-new.sh b/pkgs/development/tools/parsing/bison/builder-new.sh
old mode 100755
new mode 100644
index 42c191e3544e4..cff4b60c8e0c3
--- a/pkgs/development/tools/parsing/bison/builder-new.sh
+++ b/pkgs/development/tools/parsing/bison/builder-new.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$m4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/bison/builder.sh b/pkgs/development/tools/parsing/bison/builder.sh
old mode 100755
new mode 100644
index c112a067c7b9a..04bd1e2d29322
--- a/pkgs/development/tools/parsing/bison/builder.sh
+++ b/pkgs/development/tools/parsing/bison/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$m4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix
index 085b1e0f63641..953915729e44b 100644
--- a/pkgs/development/tools/parsing/bison/default.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, m4}:
 assert m4 != null;
-derivation {
+stdenv.mkDerivation {
   name = "bison-1.875";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
-  stdenv = stdenv;
   m4 = m4;
 }
diff --git a/pkgs/development/tools/parsing/flex/builder-new.sh b/pkgs/development/tools/parsing/flex/builder-new.sh
old mode 100755
new mode 100644
index dc78198f37dce..55947cd7e8c75
--- a/pkgs/development/tools/parsing/flex/builder-new.sh
+++ b/pkgs/development/tools/parsing/flex/builder-new.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 export buildinputs="$yacc $m4"
 . $stdenv/setup
 
diff --git a/pkgs/development/tools/parsing/flex/builder.sh b/pkgs/development/tools/parsing/flex/builder.sh
old mode 100755
new mode 100644
index 4c0975805508c..e032b03171514
--- a/pkgs/development/tools/parsing/flex/builder.sh
+++ b/pkgs/development/tools/parsing/flex/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 export buildinputs="$yacc"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 3a4e3649e002d..b48a1d8621fab 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, yacc}:
 assert yacc != null;
-derivation {
+stdenv.mkDerivation {
   name = "flex-2.5.4a";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
-  stdenv = stdenv;
   yacc = yacc;
 }
diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh
index c0a41147baef9..4c3af02261a7f 100644
--- a/pkgs/development/tools/parsing/pgen/builder.sh
+++ b/pkgs/development/tools/parsing/pgen/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr"
 . $stdenv/setup
 
diff --git a/pkgs/development/tools/parsing/pt-support/builder.sh b/pkgs/development/tools/parsing/pt-support/builder.sh
old mode 100755
new mode 100644
index a76e84c4bb412..9c03520e9a2c4
--- a/pkgs/development/tools/parsing/pt-support/builder.sh
+++ b/pkgs/development/tools/parsing/pt-support/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $toolbuslib"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/sdf-support/builder.sh b/pkgs/development/tools/parsing/sdf-support/builder.sh
old mode 100755
new mode 100644
index 258b63002fe4f..8e0c8537dafbb
--- a/pkgs/development/tools/parsing/sdf-support/builder.sh
+++ b/pkgs/development/tools/parsing/sdf-support/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $ptsupport $toolbuslib"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/sdf2/builder.sh b/pkgs/development/tools/parsing/sdf2/builder.sh
old mode 100755
new mode 100644
index f12e8ca548abb..ccba62988381b
--- a/pkgs/development/tools/parsing/sdf2/builder.sh
+++ b/pkgs/development/tools/parsing/sdf2/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$aterm $getopt"
 . $stdenv/setup
 
diff --git a/pkgs/development/tools/parsing/sdf2/default.nix b/pkgs/development/tools/parsing/sdf2/default.nix
index b5fa9d64bff56..93f5944f97d86 100644
--- a/pkgs/development/tools/parsing/sdf2/default.nix
+++ b/pkgs/development/tools/parsing/sdf2/default.nix
@@ -1,13 +1,11 @@
 {stdenv, fetchurl, aterm, getopt}:
-derivation {
+stdenv.mkDerivation {
   name = "sdf2-1.6";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-1.6.tar.gz;
     md5 = "283be0b4c7c9575c1b5cc735316e6192";
   };
-  stdenv = stdenv;
   aterm = aterm;
   getopt = getopt;
 }
diff --git a/pkgs/development/tools/parsing/sglr/builder.sh b/pkgs/development/tools/parsing/sglr/builder.sh
old mode 100755
new mode 100644
index 1b0d2d35a1a0e..4898bdad8d416
--- a/pkgs/development/tools/parsing/sglr/builder.sh
+++ b/pkgs/development/tools/parsing/sglr/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $ptsupport $toolbuslib"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/tools/parsing/toolbuslib/builder.sh b/pkgs/development/tools/parsing/toolbuslib/builder.sh
old mode 100755
new mode 100644
index bb5e4dc0c3a46..5a224b5498f7f
--- a/pkgs/development/tools/parsing/toolbuslib/builder.sh
+++ b/pkgs/development/tools/parsing/toolbuslib/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm"
 . $stdenv/setup || exit 1
 
-- 
cgit 1.4.1