b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
radianWrapper: Explicitly set R_HOME and always have R in buildInputs
This commit is contained in:
Justin Bedő 2023-04-30 08:18:09 +10:00 committed by GitHub
parent 765828b642 e7c6fb0f86
commit 9fed7877db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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