diff options
author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-03-28 09:20:29 -0400 |
---|---|---|
committer | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-04-29 15:35:14 -0400 |
commit | 7712ae48a06bd1a82e7bdf75bff69f6d07599248 (patch) | |
tree | 1633bfc845e589a3fe3b80997ac714b5f556debb | |
parent | 28a2b00008f0cc3495707eaed41fce0f3e0958cc (diff) |
sway-unwrapped: use meson string functions
-rw-r--r-- | pkgs/by-name/sw/sway-unwrapped/package.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index d15a3819ffbf2..29ac9d155831d 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = let + inherit (lib.strings) mesonEnable mesonOption; + # 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 @@ -67,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: { # assert trayEnabled -> systemdSupport && dbusSupport; sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; - in - [ "-Dsd-bus-provider=${sd-bus-provider}" ] - ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" - ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" - ; + in [ + (mesonOption "sd-bus-provider" sd-bus-provider) + (mesonEnable "xwayland" finalAttrs.enableXWayland) + (mesonEnable "tray" finalAttrs.trayEnabled) + ]; passthru.tests.basic = nixosTests.sway; |