gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 02:28:57 +01:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Flatpak improvements (#7460)

Browse Source
This commit is contained in:
Elian Doran 2025-10-22 18:27:33 +03:00 committed by GitHub
commit a7e0866e0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/desktop/electron-forge/forge.config.ts
View File

@ -70,7 +70,6 @@ const config: ForgeConfig = {
] ]
}, },
rebuildConfig: { rebuildConfig: {
force: true,
extraModules: [ "better-sqlite3" ] extraModules: [ "better-sqlite3" ]
}, },
makers: [ makers: [
@ -85,14 +84,30 @@ const config: ForgeConfig = {
config: { config: {
options: { options: {
...baseLinuxMakerConfigOptions, ...baseLinuxMakerConfigOptions,
desktopTemplate: undefined, // otherwise it would put in the wrong exec
icon: {
"128x128": path.join(APP_ICON_PATH, "png/128x128.png"),
},
id: "com.triliumnext.notes", id: "com.triliumnext.notes",
runtimeVersion: "24.08", runtimeVersion: "24.08",
base: "org.electronjs.Electron2.BaseApp", base: "org.electronjs.Electron2.BaseApp",
baseVersion: "24.08", baseVersion: "24.08",
baseFlatpakref: "https://flathub.org/repo/flathub.flatpakrepo", baseFlatpakref: "https://flathub.org/repo/flathub.flatpakrepo",
finishArgs: [ finishArgs: [
// Wayland/X11 Rendering
"--socket=fallback-x11", "--socket=fallback-x11",
"--socket=wayland" "--socket=wayland",
"--share=ipc",
// Open GL
"--device=dri",
// Audio output
"--socket=pulseaudio",
// Read/write home directory access
"--filesystem=home",
// Allow communication with network
"--share=network",
// System notifications with libnotify
"--talk-name=org.freedesktop.Notifications",
], ],
modules: [ modules: [
{ {

3
apps/desktop/package.json
View File

@ -15,7 +15,8 @@
"start-no-dir": "cross-env TRILIUM_PORT=37743 tsx ../../scripts/electron-start.mts src/main.ts", "start-no-dir": "cross-env TRILIUM_PORT=37743 tsx ../../scripts/electron-start.mts src/main.ts",
"build": "tsx scripts/build.ts", "build": "tsx scripts/build.ts",
"start-prod": "pnpm build && cross-env TRILIUM_DATA_DIR=data TRILIUM_PORT=37841 ELECTRON_IS_DEV=0 electron dist", "start-prod": "pnpm build && cross-env TRILIUM_DATA_DIR=data TRILIUM_PORT=37841 ELECTRON_IS_DEV=0 electron dist",
"electron-forge:make": "pnpm build && cross-env electron-forge make dist", "electron-forge:make": "pnpm build && electron-forge make dist",
"electron-forge:make-flatpak": "pnpm build && electron-forge make dist --targets=@electron-forge/maker-flatpak",
"electron-forge:package": "pnpm build && electron-forge package dist", "electron-forge:package": "pnpm build && electron-forge package dist",
"electron-forge:start": "pnpm build && electron-forge start dist", "electron-forge:start": "pnpm build && electron-forge start dist",
"e2e": "pnpm build && cross-env TRILIUM_INTEGRATION_TEST=memory-no-store TRILIUM_PORT=8082 TRILIUM_DATA_DIR=data-e2e ELECTRON_IS_DEV=0 playwright test" "e2e": "pnpm build && cross-env TRILIUM_INTEGRATION_TEST=memory-no-store TRILIUM_PORT=8082 TRILIUM_DATA_DIR=data-e2e ELECTRON_IS_DEV=0 playwright test"