From 0998cf85d07207fecf8896b93996ae912e279252 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 17 Mar 2026 09:17:21 +1100 Subject: [PATCH] rWrapper,radianWrapper,rstudioWrapper,rstudioServerWrapper: use makeBinaryWrapper --- pkgs/development/r-modules/wrapper-radian.nix | 4 ++-- pkgs/development/r-modules/wrapper-rstudio.nix | 4 ++-- pkgs/development/r-modules/wrapper.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/r-modules/wrapper-radian.nix b/pkgs/development/r-modules/wrapper-radian.nix index 3b9938b78db6..1c340b18fcfd 100644 --- a/pkgs/development/r-modules/wrapper-radian.nix +++ b/pkgs/development/r-modules/wrapper-radian.nix @@ -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; }; diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index c306e83edcac..2c920ad425b6 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -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 = [ diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index e1b96aecfe28..05545f71f678 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -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