nixos/uwsm: add desktop entries to displayManager again (#490733) (68152863) · Commits · nix / nixpkgs

nixos/modules/programs/wayland/uwsm.nix

+15 −12

Original line number	Diff line number	Diff line
		@@ -24,6 +24,19 @@ let
		passthru.providedSessions = [ "${opts.name}-uwsm" ];
		};
		});

		desktopEntries = lib.mapAttrsToList (
		name: value:
		mk_uwsm_desktop_entry {
		inherit name;
		inherit (value)
		prettyName
		comment
		binPath
		extraArgs
		;
		}
		) cfg.waylandCompositors;
		in
		{
		options.programs.uwsm = {
		@@ -126,18 +139,8 @@ in
		}

		(lib.mkIf (cfg.waylandCompositors != { }) {
		environment.systemPackages = lib.mapAttrsToList (
		name: value:
		mk_uwsm_desktop_entry {
		inherit name;
		inherit (value)
		prettyName
		comment
		binPath
		extraArgs
		;
		}
		) cfg.waylandCompositors;
		environment.systemPackages = desktopEntries;
		services.displayManager.sessionPackages = desktopEntries;
		})
		]
		);