* 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

116 files changed, 63 insertions, 310 deletions

diff --git a/pkgs/development/libraries/a52dec/builder.sh b/pkgs/development/libraries/a52dec/builder.sh
index 55367c159e3..1899153fa34 100755..100644
--- 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 5dbd14fb64f..20692fafb26 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
index f213ca74ebd..43db47a8b26 100755..100644
--- 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 c39390666b4..7dc7b7c6c14 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
index f32e4ec50dd..8b938d160fe 100755..100644
--- 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 cfe4a00efe6..9486ec8ba6d 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
index c5ca8edfb92..d425249cbc2 100755..100644
--- 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 77b025b739f..d033dfe719e 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
index dc4243fadfe..324d2d9f843 100755..100644
--- 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 c9340043d90..16e13b75125 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 a73f5a6d5b8..00000000000
--- 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 58dc8794c18..6ff2e851997 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 a73f5a6d5b8..00000000000
--- 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 d60b03c1dac..ed1765fa363 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 a73f5a6d5b8..00000000000
--- 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 dc95abe5102..69a6ea554ae 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 dc844d758a8..00000000000
--- 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 be6d6e262c0..894f0d5a088 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 a73f5a6d5b8..00000000000
--- 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 5d2e62c8c33..0645a18446e 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 dc844d758a8..00000000000
--- 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 b5f9eb590b5..a706397e085 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 dc844d758a8..00000000000
--- 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 f22195154b9..eac4b89ab3f 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
index f1230bed2d8..abcab635a60 100755..100644
--- 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 a5ef56ba46c..d1b7dc4476c 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 dc844d758a8..00000000000
--- 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 008590ef43d..6cfea954802 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
index 81bd27e4882..724d378e623 100755..100644
--- 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 4284979844d..108874a3159 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
index 57f18bb3da1..b91861bfa7f 100755..100644
--- 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 d20c6f4763e..6cd64d2f69a 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
index 29bcc7dc8e7..398820c0038 100755..100644
--- 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 c65281a7ce3..90be37aefe6 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
index 220307fd8b9..3590c5e23fb 100755..100644
--- 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 cccf0e0d36c..ae6aadd42b2 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
index 814beb57361..19d7bf711ad 100755..100644
--- 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 31f144b1d79..e6163c9f381 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
index 87dbfe6cf99..466ad2087e3 100755..100644
--- 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 8203db963ca..d1fc483716b 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
index bebb21cafda..a2c5cca65f3 100755..100644
--- 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 7e51b9d6fba..5dd792ef67c 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
index 46d023e04a3..60cd167a542 100755..100644
--- 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 ffcd6d19a78..d523fd60c86 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
index 752464fe4ec..e32024f2d1f 100755..100644
--- 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 b2cd632f6ce..39f0a83bfd4 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
index 113dfef5a64..72b9bf8b0f2 100755..100644
--- 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 e6ab1cb019b..9d99b903978 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
index 61ebd1faa4d..1f4e7265a02 100755..100644
--- 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 9241d3e2b96..23bb0d5dea8 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
index eb53f4f9648..fb6ccb9677f 100755..100644
--- 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 c2a6adb9ece..b30a6ad6c84 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
index a0141498350..9f538ee1b87 100755..100644
--- 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 3efa13fe151..bf700b75677 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
index 9917fd2c5e9..4c185c4c7a6 100755..100644
--- 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 543586eb20a..475bf9c9fa3 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
index 30de2db56cd..bd32300351c 100755..100644
--- 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 d33a54cf7a2..ac4a61365e8 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
index 550ee65a8d0..c7eddf4ffa9 100755..100644
--- 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 fef31114b1b..878a5936a3c 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
index 23711d9ea6f..c0ccfec36ef 100755..100644
--- 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 9a97d7697a9..a44d8bb6a99 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 a73f5a6d5b8..00000000000
--- 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 dbf194171c9..d0654900f02 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 a73f5a6d5b8..00000000000
--- 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 eb61048c3af..f8bb0f0e782 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
index 3f0cb5a1505..9c1af29b65e 100755..100644
--- 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 7ee815ec5f6..7762ee57b77 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
index be57a268c12..a5af70b675a 100755..100644
--- 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 7d45fbca050..f08c561676f 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
index 8f4c0b097b2..5f12963eb8b 100755..100644
--- 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 88bb1259373..83700be4863 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
index 0b444c1f009..38659aa31c2 100755..100644
--- 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 1437221c813..0efb546b107 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
index 6242083508d..0ec40bf7b40 100755..100644
--- 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 36731123e56..36d204a5e6d 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
index 6d7015b1054..c7bd41840bb 100755..100644
--- 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 8745bd54686..fe51ca0bb1f 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
index 6b2b5132304..686288592b3 100755..100644
--- 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 7c4d67dbb02..820d9df2f8a 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
index 4ecafb3a069..1581116ce53 100755..100644
--- 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 11da28b6f85..926180384d1 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
index 9a27a8545c4..16a3d377f17 100755..100644
--- 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 80946833f72..8b6d44e1c9d 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
index 27e135bf7ee..b6a916f74b6 100755..100644
--- 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 38f229e44e5..a7441fbe6f2 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
index 24b847b5986..515c3828ca1 100755..100644
--- 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 5e0d65dc02e..cb651485b69 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
index 59fa97888e9..b26eba9c566 100755..100644
--- 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 7b16f5f067c..4cfe16e485c 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
index d787dee7071..da5a450ffb8 100755..100644
--- 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 7533451029e..8e218a4dd72 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
index 70521de25cf..e5cc0f5a667 100755..100644
--- 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 b005aca4aaf..523d6cf9fd2 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
index 22fd9594af0..6dc6a220e92 100755..100644
--- 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 1b4da9bc2ce..a57314a3fdd 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
index 3738256e5d0..23091ee306c 100755..100644
--- 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 41eac6d2dd0..9f52fe66286 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
index c1493365ae6..596a80cd371 100755..100644
--- 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 5a8fb164028..4ca67d3f5d4 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 a73f5a6d5b8..00000000000
--- 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 5b98a264e3c..9c5e3c67282 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
index 62100048d0a..851e010f038 100755..100644
--- 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 7ad1cb807b7..4383b8486ef 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
index 60ac15542e5..1b427b79156 100755..100644
--- 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 81319bcaff2..a71b91a3368 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
index 4dc559c6228..eeb2371aaac 100755..100644
--- 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 38e7c73e944..1e80b1367ff 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
index 64e4a5ff832..d2b0880add9 100755..100644
--- 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 039579c2d54..27bfcf2ebff 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
index 085974877de..4ed7d6e918a 100755..100644
--- 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 ea1cef2cfe6..69aef8a7605 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 b8e06a6907f..00000000000
--- 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 c5889e57fb4..6dec5bac1fe 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
index a123b16dce2..379ad847fae 100755..100644
--- 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 54de0c92816..6ba67e64223 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;