vscode-langservers-extracted: expose vscode-eslint, switch to vscodium (#239650)
* vscode-langservers-extracted: expose vscode-eslint * vscode-langservers-extracted: use vscodium * Apply suggestions from code review --------- Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
9c98b1a744
commit
235fde44a5
1 changed files with 7 additions and 11 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscode }:
|
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscodium, vscode-extensions }:
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "vscode-langservers-extracted";
|
pname = "vscode-langservers-extracted";
|
||||||
|
@ -11,20 +11,14 @@ buildNpmPackage rec {
|
||||||
hash = "sha256-RLRDEHfEJ2ckn0HTMu0WbMK/o9W20Xwm+XI6kCq57u8=";
|
hash = "sha256-RLRDEHfEJ2ckn0HTMu0WbMK/o9W20Xwm+XI6kCq57u8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-QhiSj/DigsI4Bfwmk3wG4lDQOWuDDduc/sfJlXiEoGE=";
|
npmDepsHash = "sha256-DhajWr+O0zgJALr7I/Nc5GmkOsa9QXfAQpZCaULV47M=";
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# TODO: Add vscode-eslint as a dependency
|
|
||||||
# Eliminate the vscode-eslint bin
|
|
||||||
sed -i '/^\s*"vscode-eslint-language-server":.*bin\//d' package.json package-lock.json
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase =
|
buildPhase =
|
||||||
let
|
let
|
||||||
extensions =
|
extensions =
|
||||||
if stdenv.isDarwin
|
if stdenv.isDarwin
|
||||||
then "${vscode}/Applications/Visual\\ Studio\\ Code.app/Contents/Resources/app/extensions"
|
then "${vscodium}/Applications/VSCodium.app/Contents/Resources/app/extensions"
|
||||||
else "${vscode}/lib/vscode/resources/app/extensions";
|
else "${vscodium}/lib/vscode/resources/app/extensions";
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
npx babel ${extensions}/css-language-features/server/dist/node \
|
npx babel ${extensions}/css-language-features/server/dist/node \
|
||||||
|
@ -35,11 +29,13 @@ buildNpmPackage rec {
|
||||||
--out-dir lib/json-language-server/node/
|
--out-dir lib/json-language-server/node/
|
||||||
npx babel ${extensions}/markdown-language-features/server/dist/node \
|
npx babel ${extensions}/markdown-language-features/server/dist/node \
|
||||||
--out-dir lib/markdown-language-server/node/
|
--out-dir lib/markdown-language-server/node/
|
||||||
|
cp -r ${vscode-extensions.dbaeumer.vscode-eslint}/share/vscode/extensions/dbaeumer.vscode-eslint/server/out \
|
||||||
|
lib/eslint-language-server
|
||||||
mv lib/markdown-language-server/node/workerMain.js lib/markdown-language-server/node/main.js
|
mv lib/markdown-language-server/node/workerMain.js lib/markdown-language-server/node/main.js
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "HTML/CSS/JSON/ESLint language servers extracted from vscode.";
|
description = "HTML/CSS/JSON/ESLint language servers extracted from vscode";
|
||||||
homepage = "https://github.com/hrsh7th/vscode-langservers-extracted";
|
homepage = "https://github.com/hrsh7th/vscode-langservers-extracted";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ lord-valen ];
|
maintainers = with maintainers; [ lord-valen ];
|
||||||
|
|
Loading…
Reference in a new issue