From 6e8ff63c21d710c65c1b1ff23cfc5c3b9be71e48 Mon Sep 17 00:00:00 2001 From: aiwao <233898056+aiwao@users.noreply.github.com> Date: Thu, 4 Jun 2026 20:03:41 +0900 Subject: [PATCH] css-variables-language-server: fix darwin build --- .../css-variables-language-server/package.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cs/css-variables-language-server/package.nix b/pkgs/by-name/cs/css-variables-language-server/package.nix index 681b1ee3dfae..f69143e7973e 100644 --- a/pkgs/by-name/cs/css-variables-language-server/package.nix +++ b/pkgs/by-name/cs/css-variables-language-server/package.nix @@ -20,15 +20,21 @@ buildNpmPackage (finalAttrs: { hash = "sha256-NdacBF8sUOij6k4AkMim93LrBJi8JL43q/N8GryTXHA="; }; - npmDepsHash = "sha256-cgX/M05UGsx87QO/Ge0VCD2hQ9MkfJarJVNCj/IcnM0="; + npmDepsHash = "sha256-9iPS7/fiJFBFlqt71q5i9rY0lc3tqYeAddb+oB1uxZc="; + npmDepsFetcherVersion = 2; + npmWorkspace = "packages/css-variables-language-server"; - nativeBuildInputs = [ - pkg-config - makeWrapper + npmPruneFlags = [ + "--include-workspace-root=false" ]; - buildInputs = [ - libsecret + npmInstallFlags = [ + "--workspace=packages/css-variables-language-server" + "--include-workspace-root=false" + ]; + + nativeBuildInputs = [ + makeWrapper ]; preBuild = '' @@ -39,12 +45,11 @@ buildNpmPackage (finalAttrs: { runHook preInstall mkdir -p $out/lib $out/bin + cp -r node_modules $out/lib cp -r packages $out/lib - makeWrapper ${nodejs}/bin/node $out/bin/index.js --add-flags "$out/lib/packages/css-variables-language-server/dist/index.js" - - mv $out/bin/index.js $out/bin/css-variables-language-server + makeWrapper ${nodejs}/bin/node $out/bin/css-variables-language-server --add-flags "$out/lib/packages/css-variables-language-server/dist/index.js" runHook postInstall '';