From 4e1e248cf1dc0f90d7853d8dd716372a88dd7d85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:24:57 +0200
Subject: [PATCH] r-generic-builder: clean up the expression

---
 .../development/r-modules/generic/default.nix | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/r-modules/generic/default.nix b/pkgs/development/r-modules/generic/default.nix
index d405cc018d1..1e6977430d9 100644
--- a/pkgs/development/r-modules/generic/default.nix
+++ b/pkgs/development/r-modules/generic/default.nix
@@ -1,17 +1,9 @@
 R:
 
-{ buildInputs ? [], ... } @ attrs:
+{ name, buildInputs ? [], ... } @ attrs:
 
-R.stdenv.mkDerivation (
-  {
-  }
-  //
-  attrs
-  //
-  {
-    name = "r-" + attrs.name;
-    builder = ./builder.sh;
-    buildInputs = buildInputs ++ [ R ];
-    phases = [ "installPhase" "fixupPhase" ];
-  }
-)
+R.stdenv.mkDerivation (attrs // {
+  name = "r-" + name;
+  builder = ./builder.sh;
+  buildInputs = buildInputs ++ [ R ];
+})