diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-30 11:36:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 11:36:56 +0100 |
| commit | 87908c374347c2761d672bcb5f9c5258a1b48f4c (patch) | |
| tree | 7e616390d50f073e32887cc2701e391eb80fed5c /pkgs/misc | |
| parent | 19d44fc97dd1cd4efe57b5bb99616ed78cd20e02 (diff) | |
| parent | 6149df8fd095cb6fe5a0a4fc2438e2805942ad59 (diff) | |
| download | nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.gz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.bz2 nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.lz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.xz nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.tar.zst nixlib-87908c374347c2761d672bcb5f9c5258a1b48f4c.zip | |
Merge pull request #89184 from mayflower/continue-pull-85764
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 230ee383af3a..9f49f4c8eef0 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ # Update script: pkgs/development/tools/rust/rust-analyzer/update.sh -{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages_10_x +{ lib, stdenv, vscode-utils, jq, rust-analyzer, nodePackages , setDefaultServerPath ? true }: @@ -10,7 +10,7 @@ let # Follow the unstable version of rust-analyzer, since the extension is not stable yet. inherit (rust-analyzer) version; - build-deps = nodePackages_10_x."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { |