Skip to content

Commit

Permalink
Move extra wayland-sys-dependency to re_tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Nov 2, 2024
1 parent befc4fc commit a3ed280
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6186,6 +6186,7 @@ dependencies = [
"puffin_http",
"re_log",
"rfd",
"wayland-sys",
]

[[package]]
Expand Down Expand Up @@ -6275,7 +6276,6 @@ dependencies = [
"syn 2.0.85",
"tempfile",
"unindent",
"wayland-sys",
"xshell",
]

Expand Down
6 changes: 1 addition & 5 deletions crates/build/re_types_builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ all-features = true

[features]
## Enable puffin profiling.
tracing = ["re_tracing/server", "dep:wayland-sys"]
tracing = ["re_tracing/server"]


[dependencies]
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion crates/utils/re_tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"] }

0 comments on commit a3ed280

Please sign in to comment.