From a687f1aef482c602da86f84133465d2b4e07e60b Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Sun, 8 Aug 2021 13:09:22 +0900
Subject: [PATCH] vscode-extensions.matklad.rust-analyzer: fix server path

---
 pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
index 992b9835f9c3..143a74fe82dc 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
@@ -5,6 +5,7 @@
 , rust-analyzer
 , nodePackages
 , setDefaultServerPath ? true
+, moreutils
 }:
 
 let
@@ -35,13 +36,12 @@ vscode-utils.buildVscodeExtension {
   src = "${vsix}/${pname}.zip";
   vscodeExtUniqueId = "${publisher}.${pname}";
 
-  nativeBuildInputs = lib.optional setDefaultServerPath jq;
+  nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ];
 
   preInstall = lib.optionalString setDefaultServerPath ''
-    jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \
+    jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \
       --arg s "${rust-analyzer}/bin/rust-analyzer" \
-      package.json >package.json.new
-    mv package.json.new package.json
+      package.json | sponge package.json
   '';
 
   meta = with lib; {