* 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

4 files changed, 2 insertions, 10 deletions

diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh
index 75ff4d772d00..7ae6913812a4 100755..100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/builder.sh
+++ b/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
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix
index a27d35d6cc61..ccb08ffdf725 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix
+++ b/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;
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
index f28afe09465a..b4f23a98605b 100755..100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 mkdir $out || exit 1
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index 1d3e3d0325b7..bf87714a77f4 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/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;
 }