Skip to content

fix: set ozone platform for wayland#48301

Merged
deepak1556 merged 2 commits intomainfrom
clavin/fix-wayland-env-var
Sep 12, 2025
Merged

fix: set ozone platform for wayland#48301
deepak1556 merged 2 commits intomainfrom
clavin/fix-wayland-env-var

Conversation

@clavin
Copy link
Copy Markdown
Member

@clavin clavin commented Sep 11, 2025

Description of Change

In a recent upgrade roll I made a breaking change to remove the custom ELECTRON_OZONE_PLATFORM_HINT env var and directed users to use the XDG_SESSION_TYPE env var instead. However, I forgot to ensure that function to use that env var was called. Thus, this PR calls that function during startup.

The code in this PR mirrors the corresponding upstream code.

Fixes #48298
Refs #48001

Checklist

Release Notes

Notes: Fixed Wayland configuration through the XDG_SESSION_TYPE environment variable.

@clavin clavin added semver/patch backwards-compatible bug fixes target/38-x-y PR should also be added to the "38-x-y" branch. target/39-x-y PR should also be added to the "39-x-y" branch. labels Sep 11, 2025
@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Sep 11, 2025
@ckerr
Copy link
Copy Markdown
Member

ckerr commented Sep 12, 2025

macos-arm64 / test / test (darwin, 2) CI failure is unrelated to this PR; it's broken in main too. Tracked @ #48291

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Sep 12, 2025
@deepak1556 deepak1556 merged commit 5444738 into main Sep 12, 2025
57 of 58 checks passed
@deepak1556 deepak1556 deleted the clavin/fix-wayland-env-var branch September 12, 2025 23:17
@release-clerk
Copy link
Copy Markdown

release-clerk bot commented Sep 12, 2025

Release Notes Persisted

Fixed Wayland configuration through the XDG_SESSION_TYPE environment variable.

@trop
Copy link
Copy Markdown
Contributor

trop bot commented Sep 12, 2025

I have automatically backported this PR to "38-x-y", please check out #48309

@trop trop bot added in-flight/38-x-y and removed target/38-x-y PR should also be added to the "38-x-y" branch. labels Sep 12, 2025
@trop
Copy link
Copy Markdown
Contributor

trop bot commented Sep 12, 2025

I have automatically backported this PR to "39-x-y", please check out #48310

@trop trop bot added merged/39-x-y PR was merged to the "39-x-y" branch. and removed in-flight/39-x-y labels Oct 7, 2025
hacker1024 added a commit to hacker1024/nixpkgs that referenced this pull request Oct 12, 2025
nilayarya pushed a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
* fix: set ozone platform for wayland

* whoops, includes. thx charles
nilayarya added a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
* fix: set ozone platform for wayland

* whoops, includes. thx charles
nilayarya added a commit to nilayarya/electron that referenced this pull request Nov 21, 2025
* fix: set ozone platform for wayland

* whoops, includes. thx charles
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged/38-x-y PR was merged to the "38-x-y" branch. merged/39-x-y PR was merged to the "39-x-y" branch. semver/patch backwards-compatible bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Electron 38 and above do not use Wayland by default

4 participants