BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

radianWrapper: Explicitly set R_HOME and always have R in buildInputs

Browse source 
Before this commit, `wrapR = false` (the default) would lead to
situations where the `RHOME` variable would not be found. Adding `--set
R_HOME ${R}/lib/R` so that the wrapper explicitly exports `R_HOME` fixes
this issue. In addition, R is also made part of `buildInputs` by default
so that package loading works correctly.
This commit is contained in:
Savyasachee Jha 2023-04-16 16:05:06 +05:30
parent 580693af11
commit e7c6fb0f86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/r-modules/wrapper-radian.nix
View file

@ -12,8 +12,7 @@ runCommand (radian.name + "-wrapper") {
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
buildInputs = [ radian ] ++ recommendedPackages ++ packages buildInputs = [ R radian ] ++ recommendedPackages ++ packages;
++ lib.optional wrapR R;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -27,7 +26,8 @@ runCommand (radian.name + "-wrapper") {
}; };
} ('' } (''
makeWrapper "${radian}/bin/radian" "$out/bin/radian" \ 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 '' '' + lib.optionalString wrapR ''
cd ${R}/bin cd ${R}/bin
for exe in *; do for exe in *; do