Skip to content

Commit f4e663a

Browse files
Remove libxdo from the Linux desktop app, fix kitty doctor check on Wayland (#26)
1 parent 5212266 commit f4e663a

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
lines changed

Cargo.lock

Lines changed: 0 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-config/buildspec-linux-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ phases:
88
run-as: root
99
commands:
1010
- apt-get update
11-
- apt-get install -y -qq build-essential pkg-config jq dpkg curl wget zsh zstd cmake clang libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libdbus-1-dev libwebkit2gtk-4.1-dev libjavascriptcoregtk-4.1-dev valac libibus-1.0-dev libglib2.0-dev sqlite3 libxdo-dev protobuf-compiler libfuse2 dpkg-sig
11+
- apt-get install -y -qq build-essential pkg-config jq dpkg curl wget zsh zstd cmake clang libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libdbus-1-dev libwebkit2gtk-4.1-dev libjavascriptcoregtk-4.1-dev valac libibus-1.0-dev libglib2.0-dev sqlite3 protobuf-compiler libfuse2 dpkg-sig
1212
pre_build:
1313
commands:
1414
- export HOME=/home/codebuild-user

crates/fig_desktop/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ infer = "0.15.0"
6565
keyboard-types = "0.7.0"
6666
mime = "0.3.17"
6767
moka = { version = "0.12.1", features = ["future"] }
68-
muda = "0.13.0"
68+
muda = { version = "0.13.0", default-features = false }
6969
notify = "6.0.0"
7070
once_cell.workspace = true
7171
parking_lot = { version = "0.12.1", features = ["serde"] }
@@ -84,7 +84,7 @@ tempfile.workspace = true
8484
time.workspace = true
8585
tokio.workspace = true
8686
tracing.workspace = true
87-
tray-icon = "0.13.0"
87+
tray-icon = { version = "0.13.0", default-features = false }
8888
url = "2.3.1"
8989
uuid.workspace = true
9090
which.workspace = true

crates/q_cli/src/cli/doctor/checks/linux.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ impl DoctorCheck<LinuxContext> for IBusEnvCheck {
141141

142142
// IME is disabled in Kitty by default.
143143
// https://github.com/kovidgoyal/kitty/issues/469#issuecomment-419406438
144-
if let Some(Terminal::Kitty) = Terminal::parent_terminal(ctx) {
144+
if let (Some(Terminal::Kitty), DisplayServer::X11) = (Terminal::parent_terminal(ctx), get_display_server(ctx)?)
145+
{
145146
match env.get("GLFW_IM_MODULE") {
146147
Ok(actual) if actual == "ibus" => (),
147148
Ok(actual) => errors.push(EnvErr {

0 commit comments

Comments
 (0)