Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Native Wayland if Available #2

Open
wants to merge 2 commits into
base: stable
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions packaging/flatpak/manifest-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ finish-args:
- --share=ipc
# Show window using Wayland or X11
- --socket=wayland
- --socket=x11
- --socket=fallback-x11
# Access sound devices using pulseaudio
- --socket=pulseaudio
# Allow access to network
Expand All @@ -30,6 +30,8 @@ finish-args:
- --talk-name=org.freedesktop.Notifications
# Allow writing to system secrets storage
- --talk-name=org.freedesktop.secrets
# Use native Wayland if available
- --env=ELECTRON_OZONE_PLATFORM_HINT=auto
build-options:
append-path: /usr/lib/sdk/node20/bin:/usr/lib/sdk/rust-stable/bin
cflags: -O2 -g
Expand Down Expand Up @@ -58,13 +60,7 @@ modules:
- type: script
dest-filename: run.sh
commands:
- # Note: The following options were temporarily removed to work around a bug in Chromium or Electron:
#
# --ozone-platform-hint=auto \
# --enable-features="WaylandWindowDecorations" \
#
# See https://github.com/electron/electron/issues/37531
/app/main/ThreemaDesktopLauncher --launcher-target-bin /app/bin/zypak-wrapper.sh /app/main/ThreemaDesktop "$@"
- /app/main/ThreemaDesktopLauncher --launcher-target-bin /app/bin/zypak-wrapper.sh /app/main/ThreemaDesktop "$@"
build-commands:
# Build and install launcher binary
- cd src/launcher/ && cargo --offline fetch --manifest-path Cargo.toml --verbose
Expand Down