From cdfe58996753cb9137d772aedecdae0d2f68e815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Dec 2025 01:02:05 +0100 Subject: [PATCH] bitwarden-desktop: use the vendored dart from sass-embedded Other dart versions might not work, like when we upgraded dart from 3.9.3 to 3.10.4 and the build might even silently fail. --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 1a189b89ec96..4ab1e4d2c004 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ buildNpmPackage, cargo, copyDesktopItems, - dart, + dart-sass, darwin, electron_37, fetchFromGitHub, @@ -130,8 +130,13 @@ buildNpmPackage' rec { exit 1 fi + # force our dart-sass executable substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ - --replace-fail "\''${compiler_module_1.compilerModule}/dart-sass/src/dart" "${lib.getExe' dart "dartaotruntime"}" + --replace-fail "dart-sass/src/sass.snapshot" "dart-sass/src/sass.snapshot.disabled" + + for f in $(find node_modules/ -name sass -type f -executable); do + ln -sf ${lib.getExe dart-sass} $f + done pushd apps/desktop/desktop_native/napi npm run build