From 11914213887f94a0ff5e55fa3668af1e03266ece Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 7 Oct 2025 18:27:13 +0300 Subject: [PATCH] fix(flake): bettersqlite3 dependency not build properly --- flake.nix | 2 +- scripts/electron-rebuild.mts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7920ec528..00488214f 100644 --- a/flake.nix +++ b/flake.nix @@ -200,7 +200,7 @@ # '/build/source/apps/desktop/node_modules/better-sqlite3/build/node_gyp_bins' preBuildCommands = '' export npm_config_nodedir=${electron.headers} - pnpm postinstall || true + pnpm postinstall ''; buildTask = "desktop:build"; mainProgram = "trilium"; diff --git a/scripts/electron-rebuild.mts b/scripts/electron-rebuild.mts index b2d41aa88..5e343a97c 100644 --- a/scripts/electron-rebuild.mts +++ b/scripts/electron-rebuild.mts @@ -23,7 +23,7 @@ function copyNativeDependencies(projectRoot: string) { cpSync(sourcePath, destPath, { recursive: true, dereference: true }); } -function rebuildNativeDependencies(projectRoot: string) { +async function rebuildNativeDependencies(projectRoot: string) { const electronVersion = determineElectronVersion(projectRoot); if (!electronVersion) { @@ -35,7 +35,7 @@ function rebuildNativeDependencies(projectRoot: string) { console.log(`Rebuilding ${projectRoot} with ${electronVersion} for ${targetArch}...`); const resolvedPath = resolve(projectRoot); - rebuild({ + await rebuild({ projectRootPath: resolvedPath, buildPath: resolvedPath, electronVersion, @@ -64,5 +64,5 @@ function determineElectronVersion(projectRoot: string) { for (const projectRoot of [ "apps/desktop", "apps/edit-docs" ]) { copyNativeDependencies(projectRoot); - rebuildNativeDependencies(projectRoot); + await rebuildNativeDependencies(projectRoot); }