Skip to content

Commit

Permalink
Merge pull request #126 from flathub/wayland
Browse files Browse the repository at this point in the history 
add WaylandWindowDecorations and disable wayland by default
  • Loading branch information
@catsout
catsout authored Sep 5, 2023
2 parents 2f0f2a7 + 8e043f5 commit 57f1b36
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions net.cozic.joplin_desktop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ command: joplin-desktop
finish-args:
- --socket=pulseaudio
- --socket=x11
- --socket=wayland

This comment has been minimized.

Sign in to view

Copy link
@danilown

danilown Sep 10, 2023

Contributor

There might have been a mistake. Without the Wayland socket, Joplin won't start at all under Wayland. I suggest changing this line with the following:

  - --socket=wayland
  - --socket=fallback-x11

I've tested the configuration under X11 and Wayland and it is working.
- --device=dri
- --share=ipc
- --share=network
Expand Down Expand Up @@ -117,6 +116,6 @@ modules:
commands:
- export TMPDIR=$XDG_RUNTIME_DIR/app/$FLATPAK_ID
- if [ -e $XDG_RUNTIME_DIR/${WAYLAND_DISPLAY:=wayland-0} ]; then
- wayland_opt="$wayland_opt --enable-features=UseOzonePlatform --ozone-platform=wayland"
- wayland_opt="--enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform=wayland $wayland_opt"
- fi
- exec zypak-wrapper /app/joplin-desktop/joplin $wayland_opt "$@"

0 comments on commit 57f1b36

Please sign in to comment.