diff options
| author | Justin Bedő <cu@cua0.org> | 2023-04-30 08:18:09 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-30 08:18:09 +1000 |
| commit | 9fed7877dba571fb1a9aadc794870934a236f6d0 (patch) | |
| tree | 1aeee69a3abaaef717458a986a01caf2208ba48c /pkgs/development/r-modules | |
| parent | 765828b6426526bbbb08acd04af97251b15f6e0a (diff) | |
| parent | e7c6fb0f864809b66879d99d77fae9bc7b045fdc (diff) | |
| download | nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar.gz nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar.bz2 nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar.lz nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar.xz nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.tar.zst nixpkgs-9fed7877dba571fb1a9aadc794870934a236f6d0.zip | |
Merge pull request #226447 from savyajha/radian-wrapper-fix
radianWrapper: Explicitly set R_HOME and always have R in buildInputs
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/wrapper-radian.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/wrapper-radian.nix b/pkgs/development/r-modules/wrapper-radian.nix index a0a23222b52..898ab199965 100644 --- a/pkgs/development/r-modules/wrapper-radian.nix +++ b/pkgs/development/r-modules/wrapper-radian.nix @@ -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 |