Merge pull request #56781 from timokau/sage-python-upgrade-fixes

Sage python upgrade fixes
2019-03-03 20:48:10 +01:00
parent 138c15fa52 9e3754786b
commit 37182b20a6
4 changed files with 31 additions and 0 deletions
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -58,6 +58,10 @@ buildPythonPackage rec {
      tidyr
    ]) ++ extraRPackages ++ rWrapper.recommendedPackages;

+    nativeBuildInputs = [
+      R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
+    ];
+
    patches = [
      # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
      # This patch sets R_LIBS_SITE when rpy2 is imported.