From 1ed19e33d28199471e99157f4a968f6332e8476d Mon Sep 17 00:00:00 2001 From: Mikkelsej Date: Thu, 11 Dec 2025 16:09:46 +0100 Subject: [PATCH] rstudio: fix hardcoded /usr/bin/which paths --- pkgs/by-name/rs/rstudio/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 96cae1777c00..add0e2360079 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -10,7 +10,7 @@ fetchzip, replaceVars, runCommand, - + which, ant, cacert, cmake, @@ -217,6 +217,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # fix hardcoded paths to /usr/bin/which + substituteInPlace \ + src/node/desktop/src/main/detect-r.ts \ + src/node/desktop/src/main/gwt-callback.ts \ + src/cpp/session/modules/clang/CodeCompletion.cpp \ + src/cpp/core/system/PosixSystemTests.cpp \ + --replace-fail "/usr/bin/which" "${lib.getExe which}" + # fix .desktop Exec field substituteInPlace src/node/desktop/resources/freedesktop/rstudio.desktop.in \ --replace-fail "\''${CMAKE_INSTALL_PREFIX}/rstudio" "rstudio"