movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-30 13:05:15 +03:00
Code Activity

Merge pull request #318759 from leon-erd/master

Browse source 
nixos/hyprland: enable xdg.portal by default + use lib.mkDefault for enableWlrPortal
This commit is contained in:
Atemu 2024-06-14 12:41:53 +02:00 • committed by GitHub
commit 421fb34cad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/programs/wayland/hyprland.nix
View file

@ -56,6 +56,7 @@ in
services.displayManager.sessionPackages = [ cfg.package ]; services.displayManager.sessionPackages = [ cfg.package ];
xdg.portal = { xdg.portal = {
enable = true;
extraPortals = [ cfg.portalPackage ]; extraPortals = [ cfg.portalPackage ];
configPackages = lib.mkDefault [ cfg.package ]; configPackages = lib.mkDefault [ cfg.package ];
}; };
@ -70,7 +71,7 @@ in
(import ./wayland-session.nix { (import ./wayland-session.nix {
inherit lib pkgs; inherit lib pkgs;
enableXWayland = cfg.xwayland.enable; enableXWayland = cfg.xwayland.enable;
enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
}) })
]); ]);