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

Mark wayland-backend as optional dependency #6342

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Conversation

acook
Copy link
Contributor

@acook acook commented Oct 31, 2024

Fixes #6315

09ac8c5 introduced the wayland-backend dependency, but did not mark it as optional, this prevented the build from successfully completing on X11 systems without Wayland development libraries.

This marks it as optional like the other Wayland dependencies and allows the builds with --no-default-features on systems without Wayland to build successfully, as tested on my system.

Fixes wez#6315

wez@09ac8c5 introduced the `wayland-backend` dependency, but did not mark it as optional, this prevented the build from successfully completing on X11 systems without Wayland development libraries.
@@ -82,7 +82,7 @@ zbus = "4.2"
zvariant = "4.0"

smithay-client-toolkit = {version = "0.19", default-features=false, optional=true}
wayland-backend = {version="0.3.5", features=["client_system", "rwh_06"]}
wayland-backend = {version="0.3.5", features=["client_system", "rwh_06"], optional=true}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you also need to add wayland-backend to the list of features up on line 18 for this to work correctly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would explain all of the build failure emails I got, updated!

By making `wayland-backend` optional, it broke the builds which used Wayland since it was never required by the `wayland` feature.
@wez wez merged commit 0983ae9 into wez:main Nov 1, 2024
12 of 13 checks passed
@wez
Copy link
Owner

wez commented Nov 1, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

wgpu depends upon wayland even when building wezterm without the wayland feature
2 participants