* 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, 1 insertions, 5 deletions

diff --git a/pkgs/development/perl-modules/BerkeleyDB/builder.sh b/pkgs/development/perl-modules/BerkeleyDB/builder.sh
index ebe916c738e8d..e14e8c4311ac5 100755..100644
--- a/pkgs/development/perl-modules/BerkeleyDB/builder.sh
+++ b/pkgs/development/perl-modules/BerkeleyDB/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$perl $db4"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 8dd44e1e201ca..b4cf9f10438fa 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -2,15 +2,13 @@
 
 assert perl != null && db4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "perl-BerkeleyDB-0.25";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.25.tar.gz;
     md5 = "fcef06232d1ccd6c2a9cd114e388ea3d";
   };
-  stdenv = stdenv;
   perl = perl;
   db4 = db4;
 }