* For simple Autotools-style packages (such as the ATerm library), the

builder may now be omitted entirely; the function `mkDerivation'
  will then use a default build script.

svn path=/nixpkgs/trunk/; revision=868

pkgs/development/libraries/aterm/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "aterm-2.0.5";
-  builder = ./builder.sh;
+  configureFlags = "--with-gcc";
   src = fetchurl {
     url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.5.tar.gz;
     md5 = "68aefb0c10b2ab876b8d3c0b2d0cdb1b";

pkgs/stdenv/nix-linux/default-builder.sh

@@ -1,3 +1,2 @@
 . $stdenv/setup
-configureFlags="--with-gcc"
 genericBuild

pkgs/stdenv/nix-linux/default.nix

@@ -27,7 +27,7 @@ let {
     // {
       mkDerivation = attrs: derivation (attrs // {
         builder = pkgs.bash ~ /bin/sh;
-        args = ["-e" attrs.builder];
+        args = ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
         stdenv = body;
         system = body.system;
       });