diff options
| author | Seth Flynn <getchoo@tuta.io> | 2025-03-15 11:39:42 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2025-03-30 20:10:22 +0000 |
| commit | ae711c3e33a9143e92cb1108b537321a365947f6 (patch) | |
| tree | ac7b8c9d88efecdb84d6866ab3dcfb5267951055 | |
| parent | [24.11] shortwave: 4.0.1 -> 5.0.0 (#386661) (diff) | |
| download | nixpkgs-origin/backport-390168-to-release-24.11.tar.gz | |
nixos/wayland-session: fix conflicts between usersorigin/backport-390168-to-release-24.11
(cherry picked from commit 4df2726a5c16bf6c32242472b184a556b412d61b)
| -rw-r--r-- | nixos/modules/programs/wayland/wayland-session.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index de24bf73e630..096a98a402cb 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -14,12 +14,12 @@ programs = { dconf.enable = lib.mkDefault true; - xwayland.enable = lib.mkDefault enableXWayland; + xwayland.enable = lib.mkIf enableXWayland (lib.mkDefault true); }; services.graphical-desktop.enable = true; - xdg.portal.wlr.enable = enableWlrPortal; + xdg.portal.wlr.enable = lib.mkIf enableWlrPortal true; xdg.portal.extraPortals = lib.mkIf enableGtkPortal [ pkgs.xdg-desktop-portal-gtk ]; |