* 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

2 files changed, 3 insertions, 1 deletions

diff --git a/pkgs/stdenv/nix-linux/default-builder.sh b/pkgs/stdenv/nix-linux/default-builder.sh
new file mode 100644
index 0000000000000..9a297c67f6e81
--- /dev/null
+++ b/pkgs/stdenv/nix-linux/default-builder.sh
@@ -0,0 +1,2 @@
+. $stdenv/setup
+genericBuild
diff --git a/pkgs/stdenv/nix-linux/default.nix b/pkgs/stdenv/nix-linux/default.nix
index f7230ce1b298d..9e9602d5e1f63 100644
--- a/pkgs/stdenv/nix-linux/default.nix
+++ b/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;
       });