diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b982ec2..fa3cad4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,25 @@ jobs: restore-keys: | ${{ runner.os }}-cargo- + - name: Install Linux system dependencies + if: runner.os == 'Linux' + run: | + sudo apt-get update -qq + sudo apt-get install -y --no-install-recommends \ + libglib2.0-dev \ + libgtk-3-dev \ + libappindicator3-dev \ + libxkbcommon-dev \ + libxkbcommon-x11-dev \ + libx11-dev \ + libx11-xcb-dev \ + libxcb1-dev \ + libxcb-render0-dev \ + libxcb-shape0-dev \ + libxcb-xfixes0-dev \ + libvulkan-dev \ + pkg-config + - name: Check run: cargo check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bfdf1e7..a816375 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,8 +35,24 @@ jobs: - name: Install Linux dependencies if: matrix.os == 'ubuntu-latest' run: | - sudo apt-get update - sudo apt-get install -y pkg-config libx11-dev libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev + sudo apt-get update -qq + sudo apt-get install -y --no-install-recommends \ + pkg-config \ + libglib2.0-dev \ + libgtk-3-dev \ + libappindicator3-dev \ + libx11-dev \ + libx11-xcb-dev \ + libxcb1-dev \ + libxcb-render0-dev \ + libxcb-shape0-dev \ + libxcb-xfixes0-dev \ + libxkbcommon-dev \ + libxkbcommon-x11-dev \ + libasound2-dev \ + libudev-dev \ + libwayland-dev \ + libvulkan-dev - name: Install cargo-packager run: cargo install cargo-packager --locked diff --git a/Cargo.lock b/Cargo.lock index a357569..dc4446a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2956,25 +2956,6 @@ dependencies = [ "redox_syscall 0.7.3", ] -[[package]] -name = "libxdo" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" -dependencies = [ - "libxdo-sys", -] - -[[package]] -name = "libxdo-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" -dependencies = [ - "libc", - "x11", -] - [[package]] name = "lilt" version = "0.8.1" @@ -3210,7 +3191,6 @@ dependencies = [ "dpi", "gtk", "keyboard-types", - "libxdo", "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-core-foundation", @@ -7014,16 +6994,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - [[package]] name = "x11-dl" version = "2.21.0" diff --git a/Cargo.toml b/Cargo.toml index ba11182..02c6edf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ tokio = { version = "1", features = ["full"] } toml = "0.8" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } -tray-icon = "0.21" +tray-icon = { version = "0.21", default-features = false } uuid = { version = "1", features = ["v4", "serde"] } [dev-dependencies]