diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 01506b391dfa..d1192e700c50 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,23 +1,21 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , wayland, libxkbcommon, pcre2, json_c, libevdev -, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg +, pango, cairo, libinput, gdk-pixbuf, librsvg , wlroots_0_16, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false , enableXWayland ? true, xorg , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, dbusSupport ? true -, dbus -, trayEnabled ? systemdSupport && dbusSupport +, trayEnabled ? systemdSupport }: # The "sd-bus-provider" meson option does not include a "none" option, # but it is silently ignored iff "-Dtray=disabled". We use "basu" # (which is not in nixpkgs) instead of "none" to alert us if this # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 -assert trayEnabled -> systemdSupport && dbusSupport; +assert trayEnabled -> systemdSupport; let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { @@ -65,11 +63,9 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libxkbcommon pcre2 json_c libevdev - pango cairo libinput libcap pam gdk-pixbuf librsvg + pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm (wlroots_0_16.override { inherit enableXWayland; }) - ] ++ lib.optionals dbusSupport [ - dbus ] ++ lib.optionals enableXWayland [ xorg.xcbutilwm ];