From 6b261cc4d4306cbc1d5ff5f66bfd895208667ada Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 27 Jan 2015 14:00:00 +0100
Subject: [PATCH] rPackages: allow users to override the version of R to be
 used for building

---
 pkgs/development/r-modules/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f5851dfc831e..e60181100be4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1,9 +1,9 @@
 /* This file defines the composition for CRAN (R) packages. */
 
-{ pkgs, overrides }:
+{ R, pkgs, overrides }:
 
 let
-  inherit (pkgs) R fetchurl stdenv lib xvfb_run utillinux;
+  inherit (pkgs) fetchurl stdenv lib xvfb_run utillinux;
 
   buildRPackage = import ./generic-builder.nix { inherit R xvfb_run utillinux ; };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bec2ee74dcff..c4f8c52bb4af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7725,8 +7725,7 @@ let
     packages = [];
   };
 
-  rPackages = import ../development/r-modules {
-    inherit pkgs;
+  rPackages = callPackage ../development/r-modules {
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   };