From a382de6f21fb088d4ffb3f9b884e3f06d63e9872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 12 Jul 2024 16:31:35 +0200 Subject: [PATCH] vscode-langservers-extracted: avoid vscodium runtime dependencies by using its src --- .../vscode-langservers-extracted/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 9046d7588011..063fa93c9646 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -1,24 +1,31 @@ -{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscodium, vscode-extensions }: +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, unzip, vscodium, vscode-extensions }: buildNpmPackage rec { pname = "vscode-langservers-extracted"; version = "4.10.0"; - src = fetchFromGitHub { - owner = "hrsh7th"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk="; - }; + srcs = [ + (fetchFromGitHub { + owner = "hrsh7th"; + repo = "vscode-langservers-extracted"; + rev = "v${version}"; + hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk="; + }) + vscodium.src + ]; + + sourceRoot = "source"; npmDepsHash = "sha256-XGlFtmikUrnnWXsAYzTqw2K7Y2O0bUtYug0xXFIASBQ="; + nativeBuildInputs = [ unzip ]; + buildPhase = let extensions = if stdenv.isDarwin - then "${vscodium}/Applications/VSCodium.app/Contents/Resources/app/extensions" - else "${vscodium}/lib/vscode/resources/app/extensions"; + then "../VSCodium.app/Contents/Resources/app/extensions" + else "../resources/app/extensions"; in '' npx babel ${extensions}/css-language-features/server/dist/node \