From 6c5d2ecc42df044b1c9ef1f8e002db6200731a2d Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 24 Jun 2025 12:22:37 -0400
Subject: [PATCH] vscode-extensions.reditorsupport.r: install languageserver
 correctly

---
 .../vscode/extensions/reditorsupport.r/default.nix     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
index b35de8c5ce0b..ab4a4f2cfa36 100644
--- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix
@@ -3,9 +3,11 @@
   vscode-utils,
   jq,
   moreutils,
+  languageserver ? rPackages.languageserver,
   R,
-  rPackages,
   radian,
+
+  rPackages,
 }:
 
 vscode-utils.buildVscodeMarketplaceExtension {
@@ -19,17 +21,13 @@ vscode-utils.buildVscodeMarketplaceExtension {
     jq
     moreutils
   ];
-  buildInputs = [
-    radian
-    R
-    rPackages.languageserver
-  ];
   postInstall = ''
     cd "$out/$installPrefix"
     jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
     jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json
     jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe radian}"' package.json | sponge package.json
     jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe radian}"' package.json | sponge package.json
+    jq '.contributes.configuration.properties."r.libPaths".default = [ "${languageserver}/library" ]' package.json | sponge package.json
   '';
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog";