gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-19 06:38:59 +02:00
Code Issues Actions 119 Packages Projects Releases Wiki Activity

fix(flake): bettersqlite3 dependency not build properly

Browse Source
This commit is contained in:
Elian Doran 2025-10-07 18:27:13 +03:00
parent 831a184c2a
commit 1191421388
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -200,7 +200,7 @@
# '/build/source/apps/desktop/node_modules/better-sqlite3/build/node_gyp_bins' # '/build/source/apps/desktop/node_modules/better-sqlite3/build/node_gyp_bins'
preBuildCommands = '' preBuildCommands = ''
export npm_config_nodedir=${electron.headers} export npm_config_nodedir=${electron.headers}
pnpm postinstall || true pnpm postinstall
''; '';
buildTask = "desktop:build"; buildTask = "desktop:build";
mainProgram = "trilium"; mainProgram = "trilium";

6
scripts/electron-rebuild.mts
View File

@ -23,7 +23,7 @@ function copyNativeDependencies(projectRoot: string) {
cpSync(sourcePath, destPath, { recursive: true, dereference: true }); cpSync(sourcePath, destPath, { recursive: true, dereference: true });
} }
function rebuildNativeDependencies(projectRoot: string) { async function rebuildNativeDependencies(projectRoot: string) {
const electronVersion = determineElectronVersion(projectRoot); const electronVersion = determineElectronVersion(projectRoot);
if (!electronVersion) { if (!electronVersion) {
@ -35,7 +35,7 @@ function rebuildNativeDependencies(projectRoot: string) {
console.log(`Rebuilding ${projectRoot} with ${electronVersion} for ${targetArch}...`); console.log(`Rebuilding ${projectRoot} with ${electronVersion} for ${targetArch}...`);
const resolvedPath = resolve(projectRoot); const resolvedPath = resolve(projectRoot);
rebuild({ await rebuild({
projectRootPath: resolvedPath, projectRootPath: resolvedPath,
buildPath: resolvedPath, buildPath: resolvedPath,
electronVersion, electronVersion,
@ -64,5 +64,5 @@ function determineElectronVersion(projectRoot: string) {
for (const projectRoot of [ "apps/desktop", "apps/edit-docs" ]) { for (const projectRoot of [ "apps/desktop", "apps/edit-docs" ]) {
copyNativeDependencies(projectRoot); copyNativeDependencies(projectRoot);
rebuildNativeDependencies(projectRoot); await rebuildNativeDependencies(projectRoot);
} }