Unverified Commit 72f01b23 authored by Justin Bedő's avatar Justin Bedő Committed by GitHub
Browse files

Merge pull request #291258 from Kupac/fix_pathfindR 

rPackages.pathfindR: fix missing java
parents 13a94ad1 34faa136

pkgs/development/r-modules/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,15 @@ let 
        '';

    });



    pathfindR = old.pathfindR.overrideAttrs (attrs: {

      postPatch = ''

        substituteInPlace "R/zzz.R" \

          --replace-fail "    check_java_version()" "    Sys.setenv(JAVA_HOME = \"${lib.getBin pkgs.jre_minimal}\"); check_java_version()"

        substituteInPlace "R/active_snw_search.R" \

          --replace-fail "system(paste0(\"java" "system(paste0(\"${lib.getBin pkgs.jre_minimal}/bin/java"

      '';

    });



    pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {

      postPatch = lib.optionalString stdenv.isDarwin ''

        for file in R/*.{r,r.in}; do