* 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/tools/misc/texinfo/builder.sh

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

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