Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

flake: fix Electron version, fix Wayland support, fix source filter#2329

Merged
eliandoran merged 5 commits intoTriliumNext:developfrom
FliegendeWurst:flake-electron
Jun 17, 2025
Merged

flake: fix Electron version, fix Wayland support, fix source filter#2329
eliandoran merged 5 commits intoTriliumNext:developfrom
FliegendeWurst:flake-electron

Conversation

@FliegendeWurst
Copy link
Copy Markdown
Member

No description provided.

@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Jun 16, 2025
@FliegendeWurst FliegendeWurst marked this pull request as draft June 16, 2025 06:26
@FliegendeWurst
Copy link
Copy Markdown
Member Author

Odd CI failure. Perhaps I should make future PRs from a branch on this repository..

Anyway, I think it should be possible to fix the icon (right now it shows the default X / Wayland icon). Testing it now.

The previous value points to a file that no longer exists in the
release builds. This file also only exists in the flake build.

function getIcon() {
return path.join(RESOURCE_DIR, "images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png");
return path.join(RESOURCE_DIR, "../public/assets/icon.png");
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ The previous path doesn't exist in the (current) release build.
The new path does exist in the flake build (and the release app.asar), but it doesn't seem to load, unfortunately..

@FliegendeWurst FliegendeWurst marked this pull request as ready for review June 16, 2025 07:08
@eliandoran eliandoran added this to the v0.96.0 milestone Jun 17, 2025
@eliandoran eliandoran merged commit c6c48d8 into TriliumNext:develop Jun 17, 2025
7 of 8 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

desktop-app size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants