* 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/servers/http/apache-httpd/builder.sh

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

pkgs/servers/http/apache-httpd/default.nix

@@ -6,9 +6,8 @@ assert sslSupport -> openssl != null;
 assert db4Support -> db4 != null;
 assert expat != null && perl != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "apache-httpd-2.0.49";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -18,7 +17,7 @@ derivation {
 
   inherit sslSupport db4Support;
 
-  inherit stdenv perl expat;
+  inherit perl expat;
   openssl = if sslSupport then openssl else null;
   db4 = if db4Support then db4 else null;
 }