diff options
author | Peter Simons <simons@cryp.to> | 2021-01-18 19:25:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-18 19:25:59 +0100 |
commit | 39cb2244ff6d4a27c7444c32e1213562a7c29c4e (patch) | |
tree | 15d337c26e26e86c99cc081df4aab1198510ea24 /pkgs/development/r-modules | |
parent | fdef413dcd78d25dcac70ed3ab88feecbfd298e9 (diff) | |
parent | ef156fb8eda84d192b7af389528edeae50e5ca8b (diff) | |
download | nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar.gz nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar.bz2 nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar.lz nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar.xz nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.tar.zst nixlib-39cb2244ff6d4a27c7444c32e1213562a7c29c4e.zip |
Merge pull request #109717 from teto/fix-r-wrapper
rWrapper: use symlinkJoin instead of runCommand
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r-- | pkgs/development/r-modules/wrapper.nix | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index 76e819501a57..12704149666c 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,21 +1,31 @@ -{ runCommand, R, makeWrapper, recommendedPackages, packages }: - -runCommand (R.name + "-wrapper") { +{ symlinkJoin, R, makeWrapper, recommendedPackages, packages }: +symlinkJoin { + name = R.name + "-wrapper"; preferLocalBuild = true; allowSubstitutes = false; buildInputs = [R] ++ recommendedPackages ++ packages; + paths = [ R ]; nativeBuildInputs = [makeWrapper]; + postBuild = '' + cd ${R}/bin + for exe in *; do + rm "$out/bin/$exe" + + makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" + done + ''; + # Make the list of recommended R packages accessible to other packages such as rpy2 passthru = { inherit recommendedPackages; }; + + meta = R.meta // { + # To prevent builds on hydra + hydraPlatforms = []; + # prefer wrapper over the package + priority = (R.meta.priority or 0) - 1; + }; } -'' -mkdir -p $out/bin -cd ${R}/bin -for exe in *; do - makeWrapper ${R}/bin/$exe $out/bin/$exe \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" -done -'' |