From e4a127c171a5a7878f7ee68b62eda4009fa944b3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 2 Dec 2021 13:20:21 +1100 Subject: rPackages: allow overriding of platforms --- pkgs/development/r-modules/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a88f9635793..7924d472488 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -15,7 +15,7 @@ let # # some packages, e.g. cncaGUI, require X running while installation, # so that we use xvfb-run if requireX is true. - mkDerive = {mkHomepage, mkUrls, hydraPlatforms ? R.meta.platforms}: args: + mkDerive = {mkHomepage, mkUrls, hydraPlatforms ? null}: args: let hydraPlatforms' = hydraPlatforms; in lib.makeOverridable ({ name, version, sha256, @@ -23,7 +23,8 @@ let doCheck ? true, requireX ? false, broken ? false, - hydraPlatforms ? hydraPlatforms', + platforms ? R.meta.platforms, + hydraPlatforms ? if hydraPlatforms' != null then hydraPlatforms' else platforms, maintainers ? [] }: buildRPackage { name = "${name}-${version}"; @@ -35,7 +36,7 @@ let propagatedBuildInputs = depends; nativeBuildInputs = depends; meta.homepage = mkHomepage (args // { inherit name; }); - meta.platforms = R.meta.platforms; + meta.platforms = platforms; meta.hydraPlatforms = hydraPlatforms; meta.broken = broken; meta.maintainers = maintainers; -- cgit 1.4.1