-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
fix: start:wayland defaults to wrong compositor socket #4268
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
Open
flightlesstux
wants to merge
1
commit into
MagicMirrorOrg:develop
Choose a base branch
from
flightlesstux:upstream-wayland-fix
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this be simplified to the following?
The current script explicitly defaults WAYLAND_DISPLAY to wayland-1, while the standard Wayland default is wayland-0. On my Debian system, removing the explicit assignment works correctly.
I haven't tested this on a Raspberry Pi, though. Could someone confirm that Electron also uses wayland-0 there when WAYLAND_DISPLAY is unset?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
works with unset WAYLAND_DISPLAY on a pi 4:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sdetweil What do you think about the simplified version
"./node_modules/.bin/electron js/electron.js --ozone-platform=wayland"?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is that a temporary parameter? or do you think it will last?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question! I just tested this with Electron 44.1.1 on Debian, and MagicMirror started successfully without
--ozone-platform=wayland.Could we simplify the script even further to this?
"start:wayland": "./node_modules/.bin/electron js/electron.js"There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, this fails on my pi 4 ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Running
XDG_SESSION_TYPE=wayland ./node_modules/.bin/electron js/electron.jsworks. Electron usesXDG_SESSION_TYPEif--ozone-platform=auto(the default).So we should not remove
--ozone-platform=wayland.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, thanks for testing! So
"./node_modules/.bin/electron js/electron.js --ozone-platform=wayland"stays the candidate.Out of curiosity: Why do you have
XDG_SESSION_TYPE=ttyand notXDG_SESSION_TYPE: wayland?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the default in raspberry pi os
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@flightlesstux Please confirm if
"start:wayland": "./node_modules/.bin/electron js/electron.js --ozone-platform=wayland"also works for you.