Remove libxcb and libwayland dependencies from wasmer-cli release build

.github/cross-linux-aarch64/Dockerfile

@@ -8,5 +8,4 @@ RUN cargo install cross
 RUN dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get install -qy curl && \
-    curl -sSL https://get.docker.com/ | sh && \
-    apt-get install --assume-yes libxkbcommon0:arm64 libwayland-cursor0:arm64 libxkbcommon-dev:arm64 libwayland-dev:arm64 libxkbcommon-x11-dev:arm64
+    curl -sSL https://get.docker.com/ | sh

.github/workflows/build.yml

@@ -87,15 +87,10 @@ jobs:
           sudo apt-get update -y
           sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04
           sudo apt-get install --reinstall g++-8
-      - name: Install dependencies on Linux
-        if: matrix.build == 'linux-x64'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
       - name: Set up base deps on musl
         if: matrix.build == 'linux-musl-x64'
         run: |
-            apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ libxkbcommon-dev wayland-dev
+            apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/documentation.yaml

@@ -13,10 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libxkbcommon-dev
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/lint.yaml

@@ -28,10 +28,6 @@ jobs:
           tar xf /opt/llvm.tar.xz --strip-components=1 -C /opt/llvm-12
           echo '/opt/llvm-12/bin' >> $GITHUB_PATH
           echo 'LLVM_SYS_120_PREFIX=/opt/llvm-12' >> $GITHUB_ENV
-      - name: Install dependencies on Linux
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
       - run: make lint
         env:
           ENABLE_CRANELIFT: "1"

.github/workflows/test-sys.yaml

@@ -98,15 +98,10 @@ jobs:
           sudo apt-get update -y
           sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04
           sudo apt-get install --reinstall g++-8
-      - name: Install dependencies on Linux
-        if: matrix.build == 'linux-x64'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libwayland-cursor0 libxkbcommon-dev libwayland-dev
       - name: Set up base deps on musl
         if: matrix.build == 'linux-musl-x64'
         run: |
-            apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ libxkbcommon-dev wayland-dev
+            apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:

CHANGELOG.md

@@ -12,6 +12,7 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
 - #2946 Remove dylib,staticlib engines in favor of a single Universal engine
 
 ### Fixed
+- [#2963](https://github.com/wasmerio/wasmer/pull/2963) Remove accidental dependency on libwayland and libxcb in ClI
 - [#2942](https://github.com/wasmerio/wasmer/pull/2942) Fix clippy lints.
 - [#2943](https://github.com/wasmerio/wasmer/pull/2943) Fix build error on some archs by using c_char instead of i8
 

lib/cli/Cargo.toml

@@ -33,7 +33,7 @@ wasmer-compiler-llvm = { version = "=2.3.0", path = "../compiler-llvm", optional
 wasmer-emscripten = { version = "=2.3.0", path = "../emscripten", optional = true }
 wasmer-vm = { version = "=2.3.0", path = "../vm" }
 wasmer-wasi = { version = "=2.3.0", path = "../wasi", optional = true }
-wasmer-wasi-experimental-io-devices = { version = "=2.3.0", path = "../wasi-experimental-io-devices", optional = true }
+wasmer-wasi-experimental-io-devices = { version = "=2.3.0", path = "../wasi-experimental-io-devices", optional = true, features = ["link_external_libs"] }
 wasmer-wast = { version = "=2.3.0", path = "../../tests/lib/wast", optional = true }
 wasmer-cache = { version = "=2.3.0", path = "../cache", optional = true }
 wasmer-types = { version = "=2.3.0", path = "../types" }

lib/wasi-experimental-io-devices/Cargo.toml

@@ -16,7 +16,7 @@ maintenance = { status = "experimental" }
 [dependencies]
 wasmer-wasi = { version = "=2.3.0", path = "../wasi", default-features=false }
 tracing = "0.1"
-minifb = "0.19"
+minifb = { version = "0.19", optional = true }
 nix = "0.20.2"
 ref_thread_local = "0.1"
 serde = "1"
@@ -29,3 +29,10 @@ default = [
 enable-serde = [
     "wasmer-wasi/enable-serde"
 ]
+# This feature exists, so that "cargo build --all" doesn't
+# accidentally link libxcbcommon and libwayland into the CLI 
+# libraries. When using wasi-experimental-io-devices, users
+# have to enable this feature manually
+link_external_libs = [
+    "minifb"
+]