commit c0132f22e935dbce8476fff255b3daf9f6e24ec3 · pyrox.dev/nixpkgs

+11

nixos/modules/services/x11/display-managers/sddm.nix

···

       268
       268
        
           environment.systemPackages = [ sddm ];

     

       269
       269
        
           services.dbus.packages = [ sddm ];

     

       270
       270
        
       

     

       271
       271
       +
           # We're not using the upstream unit, so copy these: https://github.com/sddm/sddm/blob/develop/services/sddm.service.in

     

       272
       272
       +
           systemd.services.display-manager.after = [

     

       273
       273
       +
             "systemd-user-sessions.service"

     

       274
       274
       +
             "getty@tty7.service"

     

       275
       275
       +
             "plymouth-quit.service"

     

       276
       276
       +
             "systemd-logind.service"

     

       277
       277
       +
           ];

     

       278
       278
       +
           systemd.services.display-manager.conflicts = [

     

       279
       279
       +
             "getty@tty7.service"

     

       280
       280
       +
           ];

     

       281
       281
       +
       

     

       271
       282
        
           # To enable user switching, allow sddm to allocate TTYs/displays dynamically.

     

       272
       283
        
           services.xserver.tty = null;

     

       273
       284
        
           services.xserver.display = null;

+6 -8

nixos/tests/sddm.nix

···

       23
       23
        
             enableOCR = true;

     

       24
       24
        
       

     

       25
       25
        
             testScript = { nodes, ... }: let

     

       26
       26
       -
               user = nodes.machine.config.users.users.alice;

     

       26
       26
       +
               user = nodes.machine.users.users.alice;

     

       27
       27
        
             in ''

     

       28
       28
        
               start_all()

     

       29
       29
        
               machine.wait_for_text("(?i)select your user")

     

       30
       30
        
               machine.screenshot("sddm")

     

       31
       31
        
               machine.send_chars("${user.password}\n")

     

       32
       32
       -
               machine.wait_for_file("${user.home}/.Xauthority")

     

       33
       33
       -
               machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       32
       32
       +
               machine.wait_for_file("/tmp/xauth_*")

     

       33
       33
       +
               machine.succeed("xauth merge /tmp/xauth_*")

     

       34
       34
        
               machine.wait_for_window("^IceWM ")

     

       35
       35
        
             '';

     

       36
       36
        
           };

     
···

       55
       55
        
               services.xserver.windowManager.icewm.enable = true;

     

       56
       56
        
             };

     

       57
       57
        
       

     

       58
       58
       -
             testScript = { nodes, ... }: let

     

       59
       59
       -
               user = nodes.machine.config.users.users.alice;

     

       60
       60
       -
             in ''

     

       58
       58
       +
             testScript = { nodes, ... }: ''

     

       61
       59
        
               start_all()

     

       62
       62
       -
               machine.wait_for_file("${user.home}/.Xauthority")

     

       63
       63
       -
               machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       60
       60
       +
               machine.wait_for_file("/tmp/xauth_*")

     

       61
       61
       +
               machine.succeed("xauth merge /tmp/xauth_*")

     

       64
       62
        
               machine.wait_for_window("^IceWM ")

     

       65
       63
        
             '';

     

       66
       64
        
           };

+25 -34

pkgs/applications/display-managers/sddm/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, fetchpatch

     

       2
       2
       -
       , cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs

     

       3
       3
       -
       , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd

     

       1
       1
       +
       { mkDerivation, lib, fetchFromGitHub

     

       2
       2
       +
       , cmake, extra-cmake-modules, pkg-config, qttools

     

       3
       3
       +
       , libxcb, libXau, pam, qtbase, qtdeclarative, qtquickcontrols2, systemd, xkeyboardconfig

     

       4
       4
        
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
         version = "0.19.0";

     

       8
       8
       -
       

     

       9
       9
       -
       in mkDerivation {

     

       5
       5
       +
       mkDerivation rec {

     

       10
       6
        
         pname = "sddm";

     

       11
       11
       -
         inherit version;

     

       7
       7
       +
         version = "0.20.0";

     

       12
       8
        
       

     

       13
       9
        
         src = fetchFromGitHub {

     

       14
       10
        
           owner = "sddm";

     

       15
       11
        
           repo = "sddm";

     

       16
       12
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "1s6icb5r1n6grfs137gdzfrcvwsb3hvlhib2zh6931x8pkl1qvxa";

     

       13
       13
       +
           hash = "sha256-ctZln1yQov+p/outkQhcWZp46IKITC04e22RfePwEM4=";

     

       18
       14
        
         };

     

       19
       15
        
       

     

       20
       16
        
         patches = [

     

       21
       17
        
           ./sddm-ignore-config-mtime.patch

     

       22
       18
        
           ./sddm-default-session.patch

     

       23
       23
       -
           # Load `/etc/profile` for `environment.variables` with zsh default shell.

     

       24
       24
       -
           # See: https://github.com/sddm/sddm/pull/1382

     

       25
       25
       -
           (fetchpatch {

     

       26
       26
       -
             url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";

     

       27
       27
       -
             sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";

     

       28
       28
       -
           })

     

       29
       29
       -
           # Fix build with Qt 5.15.3

     

       30
       30
       -
           # See: https://github.com/sddm/sddm/pull/1325

     

       31
       31
       -
           (fetchpatch {

     

       32
       32
       -
             url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch";

     

       33
       33
       -
             sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4";

     

       34
       34
       -
           })

     

       35
       35
       -
           # Fix fails to start while starting X server

     

       36
       36
       -
           # See: https://github.com/sddm/sddm/pull/1324

     

       37
       37
       -
           (fetchpatch {

     

       38
       38
       -
             url = "https://github.com/sddm/sddm/commit/adfaa222fdfa6115ea2b320b0bbc2126db9270a5.patch";

     

       39
       39
       -
             sha256 = "sha256-q/YLlAjxluzHMKUUQglLo3RyyhERQGPHXGr56+4R9VU=";

     

       40
       40
       -
           })

     

       41
       19
        
         ];

     

       42
       20
        
       

     

       43
       43
       -
         postPatch =

     

       44
       44
       -
           # Fix missing include for gettimeofday()

     

       45
       45
       -
           ''

     

       46
       46
       -
             sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp

     

       47
       47
       -
           '';

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           substituteInPlace src/greeter/waylandkeyboardbackend.cpp \

     

       23
       23
       +
             --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"

     

       24
       24
       +
         '';

     

       48
       25
        
       

     

       49
       26
        
         nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ];

     

       50
       27
        
       

     

       51
       28
        
         buildInputs = [

     

       52
       52
       -
           libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd

     

       29
       29
       +
           libxcb

     

       30
       30
       +
           libXau

     

       31
       31
       +
           pam

     

       32
       32
       +
           qtbase

     

       33
       33
       +
           qtdeclarative

     

       34
       34
       +
           qtquickcontrols2

     

       35
       35
       +
           systemd

     

       53
       36
        
         ];

     

       54
       37
        
       

     

       55
       38
        
         cmakeFlags = [

     

       56
       39
        
           "-DCONFIG_FILE=/etc/sddm.conf"

     

       40
       40
       +
           "-DCONFIG_DIR=/etc/sddm.conf.d"

     

       41
       41
       +
       

     

       57
       42
        
           # Set UID_MIN and UID_MAX so that the build script won't try

     

       58
       43
        
           # to read them from /etc/login.defs (fails in chroot).

     

       59
       44
        
           # The values come from NixOS; they may not be appropriate

     
···

       62
       47
        
           "-DUID_MIN=1000"

     

       63
       48
        
           "-DUID_MAX=29999"

     

       64
       49
        
       

     

       50
       50
       +
           # we still want to run the DM on VT 7 for the time being, as 1-6 are

     

       51
       51
       +
           # occupied by getties by default

     

       52
       52
       +
           "-DSDDM_INITIAL_VT=7"

     

       53
       53
       +
       

     

       65
       54
        
           "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"

     

       66
       55
        
           "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"

     

       67
       56
        
           "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"

     

       57
       57
       +
           "-DSYSTEMD_SYSUSERS_DIR=${placeholder "out"}/lib/sysusers.d"

     

       58
       58
       +
           "-DSYSTEMD_TMPFILES_DIR=${placeholder "out"}/lib/tmpfiles.d"

     

       68
       59
        
           "-DDBUS_CONFIG_DIR=${placeholder "out"}/share/dbus-1/system.d"

     

       69
       60
        
         ];

     

       70
       61

+19 -19

pkgs/applications/display-managers/sddm/sddm-default-session.patch

···

       1
       1
        
       diff --git a/src/common/Configuration.h b/src/common/Configuration.h

     

       2
       2
       -
       index cf44a62..7bb9c03 100644

     

       2
       2
       +
       index 54bcace..49cf5cb 100644

     

       3
       3
        
       --- a/src/common/Configuration.h

     

       4
       4
        
       +++ b/src/common/Configuration.h

     

       5
       5
       -
       @@ -44,6 +44,7 @@ namespace SDDM {

     

       6
       6
       -
                                                                                                           "NOTE: Currently ignored if autologin is enabled."));

     

       5
       5
       +
       @@ -48,6 +48,8 @@ namespace SDDM {

     

       7
       6
        
                Entry(InputMethod,         QString,     QStringLiteral("qtvirtualkeyboard"),                   _S("Input method module"));

     

       8
       7
        
                Entry(Namespaces,          QStringList, QStringList(),                                  _S("Comma-separated list of Linux namespaces for user session to enter"));

     

       8
       8
       +
                Entry(GreeterEnvironment,  QStringList, QStringList(),                                  _S("Comma-separated list of environment variables to be set"));

     

       9
       9
        
       +        Entry(DefaultSession,      QString,     QString(),                                      _S("System-wide default session"));

     

       10
       10
       +
       +

     

       10
       11
        
                //  Name   Entries (but it's a regular class again)

     

       11
       12
        
                Section(Theme,

     

       12
       13
        
                    Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));

     

       13
       14
        
       diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp

     

       14
       14
       -
       index 1953c76..54fe2f2 100644

     

       15
       15
       +
       index d8698b7..df3e3c4 100644

     

       15
       16
        
       --- a/src/greeter/SessionModel.cpp

     

       16
       17
        
       +++ b/src/greeter/SessionModel.cpp

     

       17
       17
       -
       @@ -43,6 +43,7 @@ namespace SDDM {

     

       18
       18
       -
                beginResetModel();

     

       19
       19
       -
                populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       18
       18
       +
       @@ -49,6 +49,7 @@ namespace SDDM {

     

       19
       19
       +
                if (dri_active)

     

       20
       20
       +
                    populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       20
       21
        
                populate(Session::X11Session, mainConfig.X11.SessionDir.get());

     

       21
       22
        
       +        selectDefaultSession();

     

       22
       23
        
                endResetModel();

     

       23
       23
       -
        

     

       24
       24
       +
       

     

       24
       25
        
                // refresh everytime a file is changed, added or removed

     

       25
       25
       -
       @@ -52,6 +53,7 @@ namespace SDDM {

     

       26
       26
       -
                    d->sessions.clear();

     

       27
       27
       -
                    populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       26
       26
       +
       @@ -62,6 +63,7 @@ namespace SDDM {

     

       27
       27
       +
                    if (dri_active)

     

       28
       28
       +
                        populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());

     

       28
       29
        
                    populate(Session::X11Session, mainConfig.X11.SessionDir.get());

     

       29
       30
        
       +            selectDefaultSession();

     

       30
       31
        
                    endResetModel();

     

       31
       32
        
                });

     

       32
       32
       -
                watcher->addPath(mainConfig.Wayland.SessionDir.get());

     

       33
       33
       -
       @@ -149,11 +151,25 @@ namespace SDDM {

     

       34
       34
       -
                    else

     

       33
       33
       +
                watcher->addPaths(mainConfig.Wayland.SessionDir.get());

     

       34
       34
       +
       @@ -164,11 +166,25 @@ namespace SDDM {

     

       35
       35
        
                        delete si;

     

       36
       36
       +
                    }

     

       36
       37
        
                }

     

       37
       38
        
       +    }

     

       38
       39
        
       +

     
···

       58
       59
        
                }

     

       59
       60
        
            }

     

       60
       61
        
       diff --git a/src/greeter/SessionModel.h b/src/greeter/SessionModel.h

     

       61
       61
       -
       index 2e2efa9..a93315c 100644

     

       62
       62
       +
       index 8f4d539..02f77ce 100644

     

       62
       63
        
       --- a/src/greeter/SessionModel.h

     

       63
       64
        
       +++ b/src/greeter/SessionModel.h

     

       64
       64
       -
       @@ -58,6 +58,7 @@ namespace SDDM {

     

       65
       65
       +
       @@ -59,6 +59,7 @@ namespace SDDM {

     

       65
       66
        
                SessionModelPrivate *d { nullptr };

     

       66
       66
       -
        

     

       67
       67
       -
                void populate(Session::Type type, const QString &path);

     

       67
       67
       +
       

     

       68
       68
       +
                void populate(Session::Type type, const QStringList &dirPaths);

     

       68
       69
        
       +        void selectDefaultSession();

     

       69
       70
        
            };

     

       70
       71
        
        }

     

       71
       71
       -