Skip to content

Commit

Permalink
Rename linux to unix to support BSDs/Linux
Browse files Browse the repository at this point in the history
We now use feature flags to control X11/Wayland exporting.
  • Loading branch information
shymega committed Jun 6, 2023
1 parent fcdd692 commit 6e42122
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ keywords = ["display", "settings", "cli"]
categories = ["command-line-utilities", "config"]

[features]
linux-wayland = [ "wayland-client", "wayland-protocols-wlr" ]
linux-x11 = []
unix-wayland = [ "wayland-client", "wayland-protocols-wlr" ]
unix-x11 = []

[dependencies]
color-eyre = "0.6.2"
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
target_os = "netbsd",
target_os = "openbsd"
),
path = "platforms/linux/mod.rs"
path = "platforms/unix/mod.rs"
)]
#[cfg_attr(target_os = "windows", path = "platforms/windows/mod.rs")]
#[cfg_attr(target_os = "macos", path = "platforms/macos/mod.rs")]
Expand Down
21 changes: 0 additions & 21 deletions src/platforms/linux/mod.rs

This file was deleted.

11 changes: 11 additions & 0 deletions src/platforms/unix/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#[cfg(feature = "unix-x11")]
mod x11;

#[cfg(feature = "unix-x11")]
pub use x11::*;

#[cfg(feature = "unix-wayland")]
mod wayland;

#[cfg(feature = "unix-wayland")]
pub use wayland::*;
File renamed without changes.
File renamed without changes.

0 comments on commit 6e42122

Please sign in to comment.