* 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/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh
index 4ecafb3a0696..1581116ce53f 100755..100644
--- a/pkgs/development/libraries/libdvdread/builder.sh
+++ b/pkgs/development/libraries/libdvdread/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 buildinputs="$libdvdcss"
 . $stdenv/setup || exit 1
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 11da28b6f854..926180384d1e 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -2,14 +2,12 @@
 
 assert libdvdcss != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libdvdread-20030812";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2;
     md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
   };
-  stdenv = stdenv;
   libdvdcss = libdvdcss;
 }