From f31f57c32dc9fb2cf97d16181a161a47b9004d70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 00:32:45 +0200
Subject: [PATCH] r-generic-builder: don't let derivation override the naming
 scheme

---
 pkgs/development/r-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index e1b3a6cc1a8..1899eaa61d4 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -3,8 +3,6 @@ R:
 { name, buildInputs ? [], ... } @ attrs:
 
 R.stdenv.mkDerivation ({
-  name = "r-" + name;
-
   buildInputs = buildInputs ++ [R];
 
   configurePhase = ''
@@ -30,4 +28,6 @@ R.stdenv.mkDerivation ({
         ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
     fi
   '';
-} // attrs)
+} // attrs // {
+  name = "r-" + name;
+})