public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89184 from mayflower/continue-pull-85764

Browse Source
This commit is contained in:
Jörg Thalheim
2020-05-30 11:36:56 +01:00
committed by GitHub
parent 19d44fc97d 6149df8fd0
commit 87908c3743
18 changed files with 4582 additions and 8877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+2 -2
View File
@@ -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 {