From a3ed280988ace6d32188dc5c17e787b9cbb29cd7 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 2 Nov 2024 10:36:31 +0100 Subject: [PATCH] Move extra wayland-sys-dependency to re_tracing --- Cargo.lock | 2 +- crates/build/re_types_builder/Cargo.toml | 6 +----- crates/utils/re_tracing/Cargo.toml | 6 +++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e420e05009ea..217e0afc8448 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6186,6 +6186,7 @@ dependencies = [ "puffin_http", "re_log", "rfd", + "wayland-sys", ] [[package]] @@ -6275,7 +6276,6 @@ dependencies = [ "syn 2.0.85", "tempfile", "unindent", - "wayland-sys", "xshell", ] diff --git a/crates/build/re_types_builder/Cargo.toml b/crates/build/re_types_builder/Cargo.toml index 1553d3a7d36f..c19b27b43422 100644 --- a/crates/build/re_types_builder/Cargo.toml +++ b/crates/build/re_types_builder/Cargo.toml @@ -22,7 +22,7 @@ all-features = true [features] ## Enable puffin profiling. -tracing = ["re_tracing/server", "dep:wayland-sys"] +tracing = ["re_tracing/server"] [dependencies] @@ -51,10 +51,6 @@ unindent.workspace = true xshell.workspace = 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"] } - [build-dependencies] # Rerun 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"] }