rPackages: allow users to override the version of R to be used for building

This commit is contained in:
Peter Simons 2015-01-27 14:00:00 +01:00
parent e13a30333b
commit 6b261cc4d4
2 changed files with 3 additions and 4 deletions

View File

@ -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 ; };

View File

@ -7725,8 +7725,7 @@ let
packages = [];
};
rPackages = import ../development/r-modules {
inherit pkgs;
rPackages = callPackage ../development/r-modules {
overrides = (config.rPackageOverrides or (p: {})) pkgs;
};