Skip to content

Commit afc13dc

Browse files
gpui_linux: split xkbcommon wayland/x11 features (#60834)
# Objective When xkbcommon compiled with either wayland or x11 only, the current manifests will prevent it from compiling, despite gpui is already wayland/x11 seperated. close #60943 ## Solution Simple changes to manifests. ## Testing ``` cargo tree -p gpui_platform --no-default-features --features {wayland,x11} -e features -i xkbcommon ``` ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [ ] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [ ] Performance impact has been considered and is acceptable Release Notes: - N/A Co-authored-by: Kirill Bulatov <kirill@zed.dev>
1 parent 9554ea5 commit afc13dc

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

crates/gpui_linux/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ wayland = [
2727
"wayland-protocols-plasma",
2828
"wayland-protocols-wlr",
2929
"filedescriptor",
30-
"xkbcommon",
30+
"xkbcommon/wayland",
3131
"open",
3232
"gpui/wayland",
3333
]
@@ -37,7 +37,7 @@ x11 = [
3737

3838
"as-raw-xcb-connection",
3939
"x11rb",
40-
"xkbcommon",
40+
"xkbcommon/x11",
4141
"xim",
4242
"x11-clipboard",
4343
"filedescriptor",
@@ -89,7 +89,7 @@ swash = { version = "0.2.6" }
8989
bitflags = { workspace = true, optional = true }
9090
filedescriptor = { version = "0.8.2", optional = true }
9191
open = { version = "5.2.0", optional = true }
92-
xkbcommon = { version = "0.8.0", features = ["wayland", "x11"], optional = true }
92+
xkbcommon = { version = "0.8.0", default-features = false, optional = true }
9393

9494
# Screen capture
9595
scap = { workspace = true, optional = true }

0 commit comments

Comments
 (0)