rWrapper,radianWrapper,rstudioWrapper,rstudioServerWrapper: use makeBinaryWrapper
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
runCommand,
|
||||
R,
|
||||
radian,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
recommendedPackages,
|
||||
packages,
|
||||
wrapR ? false,
|
||||
@@ -21,7 +21,7 @@ runCommand (radian.name + "-wrapper")
|
||||
++ recommendedPackages
|
||||
++ packages;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
passthru = { inherit recommendedPackages; };
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
runCommand,
|
||||
R,
|
||||
rstudio,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
recommendedPackages,
|
||||
packages,
|
||||
fontconfig,
|
||||
@@ -15,7 +15,7 @@ runCommand (rstudio.name + "-wrapper")
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
symlinkJoin,
|
||||
R,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
recommendedPackages,
|
||||
packages,
|
||||
}:
|
||||
@@ -19,7 +19,7 @@ symlinkJoin {
|
||||
buildInputs = [ R ] ++ recommendedPackages ++ packages;
|
||||
paths = [ R ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
cd ${R}/bin
|
||||
|
||||
Reference in New Issue
Block a user