mirror of
https://github.com/zed-industries/zed.git
synced 2026-08-25 00:45:27 +00:00
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>
This commit is contained in:
parent
9554ea58c3
commit
afc13dc8e0
1 changed files with 3 additions and 3 deletions
|
|
@ -27,7 +27,7 @@ wayland = [
|
|||
"wayland-protocols-plasma",
|
||||
"wayland-protocols-wlr",
|
||||
"filedescriptor",
|
||||
"xkbcommon",
|
||||
"xkbcommon/wayland",
|
||||
"open",
|
||||
"gpui/wayland",
|
||||
]
|
||||
|
|
@ -37,7 +37,7 @@ x11 = [
|
|||
|
||||
"as-raw-xcb-connection",
|
||||
"x11rb",
|
||||
"xkbcommon",
|
||||
"xkbcommon/x11",
|
||||
"xim",
|
||||
"x11-clipboard",
|
||||
"filedescriptor",
|
||||
|
|
@ -89,7 +89,7 @@ swash = { version = "0.2.6" }
|
|||
bitflags = { workspace = true, optional = true }
|
||||
filedescriptor = { version = "0.8.2", optional = true }
|
||||
open = { version = "5.2.0", optional = true }
|
||||
xkbcommon = { version = "0.8.0", features = ["wayland", "x11"], optional = true }
|
||||
xkbcommon = { version = "0.8.0", default-features = false, optional = true }
|
||||
|
||||
# Screen capture
|
||||
scap = { workspace = true, optional = true }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue