nixos/wayland: add gtk portal to all applicable compositors (#342646)

2024-10-01 00:23:28 +05:30
parent 265f976fee 9020d82c70
commit afab97c863
8 changed files with 13 additions and 7 deletions
@@ -19,6 +19,6 @@ in
      # To make a cardboard session available for certain DMs like SDDM
      services.displayManager.sessionPackages = [ cfg.package ];
    }
-    (import ./wayland-session.nix { inherit lib; })
+    (import ./wayland-session.nix { inherit lib pkgs; })
  ]);
 }
@@ -70,7 +70,7 @@ in
    }

    (import ./wayland-session.nix {
-      inherit lib;
+      inherit lib pkgs;
      enableXWayland = cfg.xwayland.enable;
      enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
    })
@@ -20,6 +20,6 @@ in
      # To make a labwc session available for certain DMs like SDDM
      services.displayManager.sessionPackages = [ cfg.package ];
    }
-    (import ./wayland-session.nix { inherit lib; })
+    (import ./wayland-session.nix { inherit lib pkgs; })
  ]);
 }
@@ -30,11 +30,12 @@ in
      }

      (import ./wayland-session.nix {
-        inherit lib;
+        inherit lib pkgs;
        # Hardcoded path in Mir, not really possible to disable
        enableXWayland = true;
        # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164
        enableWlrPortal = false;
+        enableGtkPortal = false;
      })
    ]
  );
@@ -56,7 +56,7 @@ in
    }

    (import ./wayland-session.nix {
-      inherit lib;
+      inherit lib pkgs;
      enableXWayland = cfg.xwayland.enable;
    })
  ]);
@@ -148,7 +148,7 @@ in
    }

    (import ./wayland-session.nix {
-      inherit lib;
+      inherit lib pkgs;
      enableXWayland = cfg.xwayland.enable;
    })
  ]);
@@ -63,7 +63,7 @@ in
          };
        }
        (import ./wayland-session.nix {
-          inherit lib;
+          inherit lib pkgs;
          enableXWayland = cfg.xwayland.enable;
        })
      ]
@@ -1,7 +1,9 @@
 {
  lib,
+  pkgs,
  enableXWayland ? true,
  enableWlrPortal ? true,
+  enableGtkPortal ? true,
 }:

 {
@@ -18,6 +20,9 @@
  services.graphical-desktop.enable = true;

  xdg.portal.wlr.enable = enableWlrPortal;
+  xdg.portal.extraPortals = lib.mkIf enableGtkPortal [
+    pkgs.xdg-desktop-portal-gtk
+  ];

  # Window manager only sessions (unlike DEs) don't handle XDG
  # autostart files, so force them to run the service