* 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/applications/editors/emacs/modes/nxml/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 mkdir -p $out/emacs/site-lisp || exit 1

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

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

pkgs/applications/graphics/gqview/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $gtk $libpng"
 . $stdenv/setup || exit 1
 

pkgs/applications/graphics/gqview/default.nix

@@ -5,9 +5,8 @@ assert pkgconfig != null && gtk != null && libpng != null;
 # not be linked against png.
 assert libpng == gtk.libpng;
 
-derivation {
+stdenv.mkDerivation {
   name = "gqview-1.3.5";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -15,7 +14,6 @@ derivation {
     md5 = "c44687bdd636ea6e5133fb936abf880a";
   };
 
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gtk = gtk;
   libpng = libpng;

pkgs/applications/misc/hello/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl"
 . $stdenv/setup || exit 1
 

pkgs/applications/misc/hello/default.nix

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

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

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
 . $stdenv/setup || exit 1
 

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

@@ -6,9 +6,8 @@ assert pkgconfig != null && gtk != null && perl != null
 
 assert libIDL.glib == gtk.glib;
 
-derivation {
+stdenv.mkDerivation {
   name = "firefox-0.8";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -16,7 +15,6 @@ derivation {
     md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
   };
 
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gtk = gtk;
   perl = perl;

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

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildInputs="$gtk $gdkpixbuf $openssl"
 . $stdenv/setup
 

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

@@ -7,9 +7,8 @@ assert gtk != null;
 assert sslSupport -> openssl != null;
 assert imageSupport -> gdkpixbuf != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "sylpheed-0.9.10";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -19,7 +18,7 @@ derivation {
 
   inherit sslSupport imageSupport;
 
-  inherit stdenv gtk;
+  inherit gtk;
   openssl = if sslSupport then openssl else null;
   gdkpixbuf = if imageSupport then gdkpixbuf else null;
 }

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

@@ -1,5 +0,0 @@
-#! /bin/sh -e
-
-buildInputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre"
-. $stdenv/setup
-genericBuild

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

@@ -8,9 +8,8 @@ assert pkgconfig != null && gtk != null && gnet != null
 assert spellChecking -> gtkspell != null && gtk == gtkspell.gtk;
 assert gtk.glib == gnet.glib;
 
-derivation {
+stdenv.mkDerivation {
   name = "pan-0.14.2.91";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -18,6 +17,10 @@ derivation {
     md5 = "4770d899a1c1ba968ce96bc5aeb07b62";
   };
 
-  gtkspell = if spellChecking then gtkspell else null;
+  buildInputs = [
-  inherit spellChecking stdenv pkgconfig gtk gnet libxml2 perl pcre;
+    pkgconfig gtk gnet libxml2 perl pcre
+    (if spellChecking then gtkspell else null)
+  ];
+
+  inherit spellChecking stdenv;
 }

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

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildInputs="$openssl $db4 $httpd $swig $python $expat"
 . $stdenv/setup
 

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

@@ -12,9 +12,8 @@ assert httpServer -> httpd != null && httpd.expat == expat;
 assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
 assert swigBindings -> swig != null && swig.pythonSupport;
 
-derivation {
+stdenv.mkDerivation {
   name = "subversion-1.0.1";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -28,5 +27,5 @@ derivation {
   swig = if swigBindings then swig else null;
   python = if swigBindings then swig.python else null;
 
-  inherit stdenv expat localServer httpServer sslSupport swigBindings;
+  inherit expat localServer httpServer sslSupport swigBindings;
 }

pkgs/applications/video/MPlayer/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$freetype $x11 $alsa"
 . $stdenv/setup || exit 1
 

pkgs/applications/video/MPlayer/default.nix

@@ -4,9 +4,8 @@
 assert x11 != null && freetype != null;
 assert alsaSupport -> alsa != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "MPlayer-1.0pre3";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -20,12 +19,10 @@ derivation {
 
   alsaSupport = alsaSupport;
 
-  stdenv = stdenv;
   x11 = x11;
   freetype = freetype;
   alsa = if alsaSupport then alsa else null;
   win32codecs = (import ./win32codecs) {
-    stdenv = stdenv;
     fetchurl = fetchurl;
   };
 }

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

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 mkdir $out || exit 1

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

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

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

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$x11"
 . $stdenv/setup || exit 1
 

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

@@ -2,9 +2,8 @@
 
 assert x11 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "mplayerplug-in-1.0pre2";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -12,6 +11,5 @@ derivation {
     md5 = "1a6eb243989c143984bb1aac63b5282e";
   };
 
-  stdenv = stdenv;
   x11 = x11;
 }

pkgs/applications/video/vlc/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$x11 $wxGTK $libdvdcss $libdvdread $libdvdplay $mpeg2dec $a52dec $libmad $alsa"
 . $stdenv/setup || exit 1
 

pkgs/applications/video/vlc/default.nix

@@ -6,9 +6,8 @@ assert x11 != null && wxGTK != null && libdvdcss != null
   && libmad != null && alsa != null;
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
 
-derivation {
+stdenv.mkDerivation {
   name = "vlc-0.7.0";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -16,7 +15,6 @@ derivation {
     md5 = "05efef68528892ca933585c7db0842e3";
   };
 
-  stdenv = stdenv;
   x11 = x11;
   wxGTK = wxGTK;
   libdvdcss = libdvdcss;

pkgs/applications/video/zapping/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
   $libglade $scrollkeeper $esound $gettext $zvbi $libjpeg $libpng"
 . $stdenv/setup || exit 1

pkgs/applications/video/zapping/default.nix

@@ -15,9 +15,8 @@ assert teletextSupport -> zvbi != null && zvbi.pngSupport
 assert jpegSupport -> libjpeg != null;
 assert pngSupport -> libpng != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "zapping-0.7cvs6";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -29,7 +28,6 @@ derivation {
   jpegSupport = jpegSupport;
   pngSupport = pngSupport;
 
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   perl = perl;
   python = python;

pkgs/build-support/fetchfile/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup
 
 echo "copying $url into $out..."

pkgs/build-support/fetchfile/default.nix

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

pkgs/build-support/fetchsvn/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$subversion"
 . $stdenv/setup
 

pkgs/build-support/fetchsvn/default.nix

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

pkgs/build-support/fetchurl/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 header "downloading $out from $url"

pkgs/build-support/fetchurl/default.nix

@@ -2,11 +2,10 @@
 
 # Note that `curl' may be `null', in case of the native stdenv.
 
-derivation {
+stdenv.mkDerivation {
   name = baseNameOf (toString url);
-  system = stdenv.system;
   builder = ./builder.sh;
   buildInputs = [curl];
   id = md5;
-  inherit stdenv url md5;
+  inherit url md5;
 }

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

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 
@@ -79,4 +77,4 @@ sed \
     -e "s^@glibc@^$glibc^g" \
     < $setupHook > $out/nix-support/setup-hook
 
-cp -p $utils $out/nix-support/utils
+cp -p $utils $out/nix-support/utils

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

@@ -1,8 +1,8 @@
-# The Nix `gcc' derivation is not directly usable, since it doesn't
+# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
 # know where the C library and standard header files are.  Therefore
 # the compiler produced by that package cannot be installed directly
 # in a user environment and used from the command line.  This
-# derivation provides a wrapper that sets up the right environment
+# stdenv.mkDerivation provides a wrapper that sets up the right environment
 # variables so that the compiler and the linker just "work".
 
 { name, stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
@@ -13,14 +13,13 @@ assert nativeTools -> nativePrefix != "";
 assert !nativeTools -> gcc != null && binutils != null;
 assert !nativeGlibc -> glibc != null;
 
-derivation {
+stdenv.mkDerivation {
-  system = stdenv.system;
   builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   gccWrapper = ./gcc-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
-  inherit name stdenv nativeTools nativeGlibc nativePrefix gcc glibc binutils;
+  inherit name nativeTools nativeGlibc nativePrefix gcc glibc binutils;
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;

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

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 mkdir -p $out/xml/dtd/docbook || exit 1

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

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

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

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 mkdir $out || exit 1

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

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

pkgs/development/compilers/gcc/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 

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;
 }

pkgs/development/compilers/ghc/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $ghc $m4"
 . $stdenv/setup || exit 1
 

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;
 }

pkgs/development/compilers/helium/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$ghc"
 . $stdenv/setup || exit 1
 

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;
 }

pkgs/development/compilers/j2sdk/builder.sh

@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . $stdenv/setup || exit 1
 version=j2sdk1.4.2_03

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

pkgs/development/compilers/jikes/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

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;
 }

pkgs/development/compilers/strategoxt/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildInputs="$aterm $sdf"
 . $stdenv/setup
 

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;
 }

pkgs/development/compilers/tiger/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$aterm $sdf $strategoxt"
 . $stdenv/setup || exit 1
 

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;

pkgs/development/interpreters/j2re/builder.sh

@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . $stdenv/setup || exit 1
 version=j2re1.4.2_03

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

pkgs/development/interpreters/perl/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$patch"
 . $stdenv/setup
 

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;
 }

pkgs/development/interpreters/python/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs=""
 if test -n "$zlibSupport"; then
   buildinputs="$zlib $buildinputs"

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;
 }

pkgs/development/libraries/a52dec/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

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;
 }

pkgs/development/libraries/audiofile/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs=""
 . $stdenv/setup || exit 1
 

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;
 }

pkgs/development/libraries/db4/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

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;
 }

pkgs/development/libraries/expat/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

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;
 }

pkgs/development/libraries/fontconfig/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$freetype $expat $x11 $ed"
 . $stdenv/setup
 

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;

pkgs/development/libraries/freedesktop/libICE/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/libSM/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/libX11/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/libXau/builder.sh

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/libXt/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/libXtrans/builder.sh

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/xextensions/builder.sh

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild

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;
 }

pkgs/development/libraries/freedesktop/xlibs/builder.sh

@@ -1,4 +1,3 @@
-#! /bin/sh -e
 . $stdenv/setup
 dontMake=1
 dontMakeInstall=1

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;

pkgs/development/libraries/freedesktop/xproto/builder.sh

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-genericBuild

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;
 }

pkgs/development/libraries/freetype/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

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;
 }

pkgs/development/libraries/gettext/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1

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;
 }

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
 

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;
 }

pkgs/development/libraries/gnet/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $glib"
 . $stdenv/setup || exit 1
 

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;
 }

pkgs/development/libraries/gnome/GConf/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt"
 . $stdenv/setup
 

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;

pkgs/development/libraries/gnome/ORBit2/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $glib $libIDL $popt"
 . $stdenv/setup
 

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;

pkgs/development/libraries/gnome/esound/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$audiofile"
 . $stdenv/setup
 

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;
 }

pkgs/development/libraries/gnome/gnome-mime-data/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$pkgconfig $perl"
 . $stdenv/setup || exit 1
 

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;
 }