diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-12-09 14:00:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 14:00:14 +0000 |
| commit | 2c3b3e69ad3306fa0711eebdac98e010c7a2d6aa (patch) | |
| tree | 2e3b4dbd207025ed3d782fc20c79944d383bc224 /pkgs/misc | |
| parent | c0eca3431441d401ac8109b51caafee492e1ac71 (diff) | |
| parent | a6d04cce6790aa9c3500f902070c263bf032c453 (diff) | |
Merge pull request #149120 from mweinelt/nodepackages-nodejs-16_x
nodePackages: move to nodejs-14_x, regenerate
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 82491389791ed..668d877678037 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -6,6 +6,8 @@ , nodePackages , moreutils , esbuild +, pkg-config +, libsecret , setDefaultServerPath ? true }: @@ -22,7 +24,11 @@ let releaseTag = rust-analyzer.version; - nativeBuildInputs = [ jq moreutils esbuild ]; + nativeBuildInputs = [ + jq moreutils esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config libsecret + ]; # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postInstall = '' @@ -34,7 +40,9 @@ let ' package.json | sponge package.json mkdir -p $vsix - npx vsce package -o $vsix/${pname}.zip + # vsce ask for continue due to missing LICENSE.md + # Should be removed after https://github.com/rust-analyzer/rust-analyzer/commit/acd5c1f19bf7246107aaae7b6fe3f676a516c6d2 + echo y | npx vsce package -o $vsix/${pname}.zip ''; }; |