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

fix: Optionally remove DISABLE_WAYLAND for snaps #6961

Merged
merged 3 commits into from
Jul 4, 2022
Merged

fix: Optionally remove DISABLE_WAYLAND for snaps #6961

merged 3 commits into from
Jul 4, 2022

Conversation

aripollak
Copy link
Contributor

@aripollak aripollak commented Jun 24, 2022

Fixes #6888

@changeset-bot
Copy link

changeset-bot bot commented Jun 24, 2022

🦋 Changeset detected

Latest commit: 41c5fa5

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages
Name Type
app-builder-lib Patch
dmg-builder Patch
electron-builder-squirrel-windows Patch
electron-builder Patch
electron-forge-maker-appimage Patch
electron-forge-maker-nsis-web Patch
electron-forge-maker-nsis Patch
electron-forge-maker-snap Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@netlify
Copy link

netlify bot commented Jun 24, 2022

Deploy Preview for car-park-attendant-cleat-11576 ready!

Name Link
🔨 Latest commit 41c5fa5
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/62c26f62b745a100080f6736
😎 Deploy Preview https://deploy-preview-6961--car-park-attendant-cleat-11576.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@aripollak aripollak changed the title fix: Remove DISABLE_WAYLAND fix: Remove DISABLE_WAYLAND for snaps Jun 24, 2022
@mmaietta
Copy link
Collaborator

mmaietta commented Jul 1, 2022

This feels like a breaking change for electron-builder. I'm wondering if we can make this a feature instead by adding allowNativeWayland as a property in SnapOptions.

allowNativeWayland: boolean | null = null

Then DISABLE_WAYLAND: Number(!allowNativeWayland)

What are your thoughts?

@aripollak
Copy link
Contributor Author

Unfortunately I'm not sure if this would be a breaking change, but I'm happy to add an option to enable it in the meantime. Maybe in the future it could be enabled by default if a minimum known-working electron version is used.

@aripollak
Copy link
Contributor Author

I'll have to use some different logic for setting DISABLE_WAYLAND because this expects it to be unset/"" for false, or a non-empty value for true.

…iveWayland option

* Update documentation for default plugs
@aripollak
Copy link
Contributor Author

Okay, I added that option. I wasn't able to update the docs locally because I haven't been able to get my local environment set up to compile this properly (pnpm install is complaining about yarn exiting with status 1).

@mmaietta mmaietta merged commit 4c867aa into electron-userland:master Jul 4, 2022
@github-actions github-actions bot mentioned this pull request Jul 4, 2022
@aripollak aripollak changed the title fix: Remove DISABLE_WAYLAND for snaps fix: Optionally remove DISABLE_WAYLAND for snaps Jul 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Please enable wayland for snaps
2 participants