Merge pull request #88791 from romildo/upd.lumina

nixos/lumina: use xsession provided

nixos/modules/services/x11/desktop-managers/lumina.nix

@@ -23,12 +23,9 @@ in
 
   config = mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = singleton {
+    services.xserver.displayManager.sessionPackages = [
-      name = "lumina";
+      pkgs.lumina.lumina
-      start = ''
+    ];
-        exec ${pkgs.lumina.lumina}/bin/start-lumina-desktop
-      '';
-    };
 
     environment.systemPackages =
       pkgs.lumina.preRequisitePackages ++

pkgs/desktops/lumina/lumina/default.nix

@@ -1,18 +1,17 @@
-{ stdenv,
+{ stdenv
-  mkDerivation,
+, mkDerivation
-  fetchFromGitHub,
+, fetchFromGitHub
-  desktop-file-utils,
+, fluxbox
-  fluxbox,
+, numlockx
-  numlockx,
+, qmake
-  qmake,
+, qtbase
-  qtbase,
+, qtmultimedia
-  qtmultimedia,
+, qtsvg
-  qtsvg,
+, qttools
-  qttools,
+, qtx11extras
-  qtx11extras,
+, xorg
-  xorg,
+, xscreensaver
-  xscreensaver,
+, wrapGAppsHook
-  wrapGAppsHook
 }:
 
 mkDerivation rec {
@@ -33,19 +32,18 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    xorg.libxcb
+    fluxbox # window manager for Lumina DE
+    numlockx # required for changing state of numlock at login
+    qtbase
+    qtmultimedia
+    qtsvg
+    qtx11extras
     xorg.libXcursor
     xorg.libXdamage
-    xorg.xcbutilwm
+    xorg.libxcb
     xorg.xcbutilimage
-    qtbase
+    xorg.xcbutilwm
-    qtsvg
-    qtmultimedia
-    qtx11extras
-    fluxbox
     xscreensaver
-    desktop-file-utils
-    numlockx
   ];
 
   patches = [
@@ -67,6 +65,12 @@ mkDerivation rec {
     # Fix location of fluxbox styles
     substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
       --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
+
+    # Fix desktop files
+    for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do
+      echo ===== $i
+      substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina'
+    done
   '';
 
   qmakeFlags = [
@@ -75,6 +79,8 @@ mkDerivation rec {
     "LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
   ];
 
+  passthru.providedSessions = [ "Lumina-DE" ];
+
   meta = with stdenv.lib; {
     description = "A lightweight, portable desktop environment";
     longDescription = ''