Unverified Commit 9fed7877 authored by Justin Bedő's avatar Justin Bedő Committed by GitHub
Browse files

Merge pull request #226447 from savyajha/radian-wrapper-fix 

radianWrapper: Explicitly set R_HOME and always have R in buildInputs
parents 765828b6 e7c6fb0f

pkgs/development/r-modules/wrapper-radian.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ runCommand (radian.name + "-wrapper") { 
  preferLocalBuild = true;

  allowSubstitutes = false;



  buildInputs = [ radian ] ++ recommendedPackages ++ packages

    ++ lib.optional wrapR R;

  buildInputs = [ R radian ] ++ recommendedPackages ++ packages;



  nativeBuildInputs = [ makeWrapper ];
@@ -27,7 +26,8 @@ runCommand (radian.name + "-wrapper") { 
  };

} (''

  makeWrapper "${radian}/bin/radian" "$out/bin/radian" \

    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"

    --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" \

    --set "R_HOME" "${R}/lib/R"

'' + lib.optionalString wrapR ''

  cd ${R}/bin

  for exe in *; do