From df8dc6233b0107617a896e81f63f54010ff9b25d Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sat, 2 Nov 2024 16:47:01 +0100
Subject: [PATCH] Fix `main` build (#7977)

### What
Fix main build

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)

- [PR Build Summary](https://build.rerun.io/pr/7977)
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

To run all checks from `main`, comment on the PR with `@rerun-bot
full-check`.
---
 .github/workflows/reusable_test_wheels.yml | 2 ++
 Cargo.lock                                 | 1 +
 Cargo.toml                                 | 1 +
 crates/utils/re_tracing/Cargo.toml         | 6 +++++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/reusable_test_wheels.yml b/.github/workflows/reusable_test_wheels.yml
index 5bc0299f3c0d..6e539fb7b449 100644
--- a/.github/workflows/reusable_test_wheels.yml
+++ b/.github/workflows/reusable_test_wheels.yml
@@ -38,6 +38,8 @@ env:
 
   RUSTDOCFLAGS: --deny warnings
 
+  RUST_BACKTRACE: "1"
+
   # Disable the GHA backend (Github's 10GB storage) since we use our own GCS backend.
   # See: https://github.com/marketplace/actions/sccache-action
   SCCACHE_GHA_ENABLED: "false"
diff --git a/Cargo.lock b/Cargo.lock
index 4656f76cf8f0..217e0afc8448 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6186,6 +6186,7 @@ dependencies = [
  "puffin_http",
  "re_log",
  "rfd",
+ "wayland-sys",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 33d6365ae8bc..51a2323dae49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -294,6 +294,7 @@ walkdir = "2.0"
 wasm-bindgen = "0.2.93"
 wasm-bindgen-cli-support = "=0.2.93"
 wasm-bindgen-futures = "0.4.33"
+wayland-sys = "0.31.5"
 web-sys = "0.3"
 web-time = "1.1.0"
 webbrowser = "1.0"
diff --git a/crates/utils/re_tracing/Cargo.toml b/crates/utils/re_tracing/Cargo.toml
index f20f7ef92a8a..74df4e3f8b93 100644
--- a/crates/utils/re_tracing/Cargo.toml
+++ b/crates/utils/re_tracing/Cargo.toml
@@ -24,7 +24,7 @@ all-features = true
 default = []
 
 ## Enable to easily host a puffin server. For binaries.
-server = ["dep:puffin_http", "dep:re_log", "dep:rfd"]
+server = ["dep:puffin_http", "dep:re_log", "dep:rfd", "dep:wayland-sys"]
 
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -34,3 +34,7 @@ puffin.workspace = true
 puffin_http = { workspace = true, optional = true }
 re_log = { workspace = true, optional = true }
 rfd = { workspace = true, optional = true }
+
+[target.'cfg(target_os = "linux")'.dependencies]
+# Work-around for https://github.com/Smithay/wayland-rs/issues/767
+wayland-sys = { workspace = true, optional = true, features = ["dlopen"] }