From bfb9f04afd41c3dd17de77c43510950f7b899151 Mon Sep 17 00:00:00 2001 From: Jake Stanger Date: Fri, 28 Mar 2025 20:51:26 +0000 Subject: [PATCH] build: fix even more coupling issues with keyboard/workspace/sway damn it --- src/clients/compositor/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/clients/compositor/mod.rs b/src/clients/compositor/mod.rs index 2f8751f..cb21d53 100644 --- a/src/clients/compositor/mod.rs +++ b/src/clients/compositor/mod.rs @@ -32,7 +32,7 @@ impl Display for Compositor { match self { #[cfg(any(feature = "keyboard+sway", feature = "workspaces+sway"))] Self::Sway => "Sway", - #[cfg(any(feature = "keyboard+sway", feature = "workspaces+hyprland"))] + #[cfg(any(feature = "keyboard+hyprland", feature = "workspaces+hyprland"))] Self::Hyprland => "Hyprland", #[cfg(feature = "workspaces+niri")] Self::Niri => "Niri", @@ -48,12 +48,12 @@ impl Compositor { fn get_current() -> Self { if std::env::var("SWAYSOCK").is_ok() { cfg_if! { - if #[cfg(feature = "workspaces+sway")] { Self::Sway } + if #[cfg(any(feature = "keyboard+sway", feature = "workspaces+sway"))] { Self::Sway } else { tracing::error!("Not compiled with Sway support"); Self::Unsupported } } } else if std::env::var("HYPRLAND_INSTANCE_SIGNATURE").is_ok() { cfg_if! { - if #[cfg(feature = "workspaces+hyprland")] { Self::Hyprland } + if #[cfg(any(feature = "keyboard+hyprland", feature = "workspaces+hyprland"))] { Self::Hyprland } else { tracing::error!("Not compiled with Hyprland support"); Self::Unsupported } } } else if std::env::var("NIRI_SOCKET").is_ok() {