diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 0136bf4e5b1b..143a74fe82dc 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,6 +1,11 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, vscode-utils, jq, rust-analyzer, nodePackages +{ lib +, vscode-utils +, jq +, rust-analyzer +, nodePackages , setDefaultServerPath ? true +, moreutils }: let @@ -24,19 +29,19 @@ let ''; }; -in vscode-utils.buildVscodeExtension { +in +vscode-utils.buildVscodeExtension { inherit version vsix; name = "${pname}-${version}"; 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; {