* 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

2 files changed, 2 insertions, 5 deletions

diff --git a/pkgs/misc/uml/builder.sh b/pkgs/misc/uml/builder.sh
index 28b3692cf65a..8abbb79301ab 100755..100644
--- a/pkgs/misc/uml/builder.sh
+++ b/pkgs/misc/uml/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$patch $perl $m4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix
index eafd5700e0be..977a26e11800 100644
--- a/pkgs/misc/uml/default.nix
+++ b/pkgs/misc/uml/default.nix
@@ -2,9 +2,8 @@
 
 assert patch != null && perl != null && m4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "uml-2.4.22-3";
-  system = stdenv.system;
   builder = ./builder.sh;
   linuxSrc = fetchurl {
     url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2;
@@ -15,5 +14,5 @@ derivation {
     md5 = "1ffa698fed37d14c6750ec841b7d9858";
   };
   config = ./config;
-  inherit stdenv patch perl m4;
+  inherit patch perl m4;
 }