Merge pull request #109717 from teto/fix-r-wrapper

rWrapper: use symlinkJoin instead of runCommand

authored by Peter Simons and committed by GitHub 39cb2244 fdef413d

+21 -11
+21 -11
pkgs/development/r-modules/wrapper.nix
··· 1 - { runCommand, R, makeWrapper, recommendedPackages, packages }: 2 - 3 - runCommand (R.name + "-wrapper") { 1 + { symlinkJoin, R, makeWrapper, recommendedPackages, packages }: 2 + symlinkJoin { 3 + name = R.name + "-wrapper"; 4 4 preferLocalBuild = true; 5 5 allowSubstitutes = false; 6 6 7 7 buildInputs = [R] ++ recommendedPackages ++ packages; 8 + paths = [ R ]; 8 9 9 10 nativeBuildInputs = [makeWrapper]; 10 11 12 + postBuild = '' 13 + cd ${R}/bin 14 + for exe in *; do 15 + rm "$out/bin/$exe" 16 + 17 + makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \ 18 + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" 19 + done 20 + ''; 21 + 11 22 # Make the list of recommended R packages accessible to other packages such as rpy2 12 23 passthru = { inherit recommendedPackages; }; 24 + 25 + meta = R.meta // { 26 + # To prevent builds on hydra 27 + hydraPlatforms = []; 28 + # prefer wrapper over the package 29 + priority = (R.meta.priority or 0) - 1; 30 + }; 13 31 } 14 - '' 15 - mkdir -p $out/bin 16 - cd ${R}/bin 17 - for exe in *; do 18 - makeWrapper ${R}/bin/$exe $out/bin/$exe \ 19 - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" 20 - done 21 - ''