commit 59aa3af15dc5f8b27c7d17d60e87294c84ace3fe · pyrox.dev/nixpkgs

+27 -75

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

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       -
       , cmake, pkg-config, qttools

     

       3
       3
       -
       , libxcb, libXau, pam, qtbase, wrapQtAppsHook, qtdeclarative

     

       4
       4
       -
       , qtquickcontrols2 ? null, systemd, xkeyboardconfig

     

       1
       1
       +
       {

     

       2
       2
       +
         callPackage,

     

       3
       3
       +
         runCommand,

     

       4
       4
       +
         wrapQtAppsHook,

     

       5
       5
       +
         unwrapped ? callPackage ./unwrapped.nix {},

     

       6
       6
       +
         extraPackages ? [],

     

       5
       7
        
       }:

     

       6
       6
       -
       let

     

       7
       7
       -
         isQt6 = lib.versions.major qtbase.version == "6";

     

       8
       8
       -
       in stdenv.mkDerivation {

     

       9
       9
       -
         pname = "sddm";

     

       10
       10
       -
         version = "0.20.0-unstable-2023-12-29";

     

       8
       8
       +
       runCommand "sddm-wrapped" {

     

       9
       9
       +
         inherit (unwrapped) version;

     

       11
       10
        
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "sddm";

     

       14
       14
       -
           repo = "sddm";

     

       15
       15
       -
           rev = "501129294be1487f753482c29949fc1c19ef340e";

     

       16
       16
       -
           hash = "sha256-mLm987Ah0X9s0tBK2a45iERwYoh5JzWb3TFlSoxi8CA=";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         patches = [

     

       20
       20
       -
           ./sddm-ignore-config-mtime.patch

     

       21
       21
       -
           ./sddm-default-session.patch

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       24
       -
         postPatch = ''

     

       25
       25
       -
           substituteInPlace src/greeter/waylandkeyboardbackend.cpp \

     

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

     

       27
       27
       -
         '';

     

       28
       28
       -
       

     

       29
       29
       -
         nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config qttools ];

     

       30
       30
       -
       

     

       31
       31
       -
         buildInputs = [

     

       32
       32
       -
           libxcb

     

       33
       33
       -
           libXau

     

       34
       34
       -
           pam

     

       35
       35
       -
           qtbase

     

       36
       36
       -
           qtdeclarative

     

       37
       37
       -
           qtquickcontrols2

     

       38
       38
       -
           systemd

     

       39
       39
       -
         ];

     

       40
       40
       -
       

     

       41
       41
       -
         cmakeFlags = [

     

       42
       42
       -
           (lib.cmakeBool "BUILD_WITH_QT6" isQt6)

     

       43
       43
       -
           "-DCONFIG_FILE=/etc/sddm.conf"

     

       44
       44
       -
           "-DCONFIG_DIR=/etc/sddm.conf.d"

     

       11
       11
       +
         buildInputs = unwrapped.buildInputs ++ extraPackages;

     

       12
       12
       +
         nativeBuildInputs = [ wrapQtAppsHook ];

     

       45
       13
        
       

     

       46
       46
       -
           # Set UID_MIN and UID_MAX so that the build script won't try

     

       47
       47
       -
           # to read them from /etc/login.defs (fails in chroot).

     

       48
       48
       -
           # The values come from NixOS; they may not be appropriate

     

       49
       49
       -
           # for running SDDM outside NixOS, but that configuration is

     

       50
       50
       -
           # not supported anyway.

     

       51
       51
       -
           "-DUID_MIN=1000"

     

       52
       52
       -
           "-DUID_MAX=29999"

     

       14
       14
       +
         passthru = {

     

       15
       15
       +
           inherit unwrapped;

     

       16
       16
       +
         };

     

       53
       17
        
       

     

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

     

       55
       55
       -
           # occupied by getties by default

     

       56
       56
       -
           "-DSDDM_INITIAL_VT=7"

     

       18
       18
       +
         meta = unwrapped.meta;

     

       19
       19
       +
       } ''

     

       20
       20
       +
         mkdir -p $out/bin

     

       57
       21
        
       

     

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

     

       59
       59
       -
           "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"

     

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

     

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

     

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

     

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

     

       64
       64
       -
         ];

     

       22
       22
       +
         cd ${unwrapped}

     

       65
       23
        
       

     

       66
       66
       -
         postInstall = ''

     

       67
       67
       -
           # remove empty scripts

     

       68
       68
       -
           rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"

     

       69
       69
       -
           for f in $out/share/sddm/themes/**/theme.conf ; do

     

       70
       70
       -
             substituteInPlace $f \

     

       71
       71
       -
               --replace 'background=' "background=$(dirname $f)/"

     

       72
       72
       -
           done

     

       73
       73
       -
         '';

     

       24
       24
       +
         for i in *; do

     

       25
       25
       +
           if [ "$i" == "bin" ]; then

     

       26
       26
       +
             continue

     

       27
       27
       +
           fi

     

       28
       28
       +
           ln -s ${unwrapped}/$i $out/$i

     

       29
       29
       +
         done

     

       74
       30
        
       

     

       75
       75
       -
         meta = with lib; {

     

       76
       76
       -
           description = "QML based X11 display manager";

     

       77
       77
       -
           homepage    = "https://github.com/sddm/sddm";

     

       78
       78
       -
           maintainers = with maintainers; [ abbradar ttuegel ];

     

       79
       79
       -
           platforms   = platforms.linux;

     

       80
       80
       -
           license     = licenses.gpl2Plus;

     

       81
       81
       -
         };

     

       82
       82
       -
       }

     

       31
       31
       +
         for i in bin/*; do

     

       32
       32
       +
           makeQtWrapper ${unwrapped}/$i $out/$i --set SDDM_GREETER $out/bin/sddm-greeter

     

       33
       33
       +
         done

     

       34
       34
       +
       ''

+32

pkgs/applications/display-managers/sddm/greeter-path.patch

···

       1
       1
       +
       diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp

     

       2
       2
       +
       index c0437ae..f814146 100644

     

       3
       3
       +
       --- a/src/daemon/Greeter.cpp

     

       4
       4
       +
       +++ b/src/daemon/Greeter.cpp

     

       5
       5
       +
       @@ -85,6 +85,9 @@ namespace SDDM {

     

       6
       6
       +
                if (m_started)

     

       7
       7
       +
                    return false;

     

       8
       8
       +
        

     

       9
       9
       +
       +        // Nixpkgs: use wrapped greeter if available

     

       10
       10
       +
       +        QString greeter = qEnvironmentVariable("SDDM_GREETER", QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR)));

     

       11
       11
       +
       +

     

       12
       12
       +
                // themes

     

       13
       13
       +
                QString xcursorTheme = mainConfig.Theme.CursorTheme.get();

     

       14
       14
       +
                if (m_themeConfig->contains(QLatin1String("cursorTheme")))

     

       15
       15
       +
       @@ -139,7 +142,7 @@ namespace SDDM {

     

       16
       16
       +
                        m_process->setProcessEnvironment(env);

     

       17
       17
       +
                    }

     

       18
       18
       +
                    // Greeter command

     

       19
       19
       +
       -            m_process->start(QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR)), args);

     

       20
       20
       +
       +            m_process->start(greeter, args);

     

       21
       21
       +
        

     

       22
       22
       +
                    //if we fail to start bail immediately, and don't block in waitForStarted

     

       23
       23
       +
                    if (m_process->state() == QProcess::NotRunning) {

     

       24
       24
       +
       @@ -173,7 +176,7 @@ namespace SDDM {

     

       25
       25
       +
        

     

       26
       26
       +
                    // command

     

       27
       27
       +
                    QStringList cmd;

     

       28
       28
       +
       -            cmd << QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR))

     

       29
       29
       +
       +            cmd << greeter

     

       30
       30
       +
                        << args;

     

       31
       31
       +
        

     

       32
       32
       +
                    // greeter environment

+86

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

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       +
       , cmake, pkg-config, qttools

     

       3
       3
       +
       , libxcb, libXau, pam, qtbase, qtdeclarative

     

       4
       4
       +
       , qtquickcontrols2 ? null, systemd, xkeyboardconfig

     

       5
       5
       +
       }:

     

       6
       6
       +
       let

     

       7
       7
       +
         isQt6 = lib.versions.major qtbase.version == "6";

     

       8
       8
       +
       in stdenv.mkDerivation {

     

       9
       9
       +
         pname = "sddm-unwrapped";

     

       10
       10
       +
         version = "0.20.0-unstable-2023-12-29";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "sddm";

     

       14
       14
       +
           repo = "sddm";

     

       15
       15
       +
           rev = "501129294be1487f753482c29949fc1c19ef340e";

     

       16
       16
       +
           hash = "sha256-mLm987Ah0X9s0tBK2a45iERwYoh5JzWb3TFlSoxi8CA=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           ./greeter-path.patch

     

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

     

       22
       22
       +
           ./sddm-default-session.patch

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         postPatch = ''

     

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

     

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

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [ cmake pkg-config qttools ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           libxcb

     

       34
       34
       +
           libXau

     

       35
       35
       +
           pam

     

       36
       36
       +
           qtbase

     

       37
       37
       +
           qtdeclarative

     

       38
       38
       +
           qtquickcontrols2

     

       39
       39
       +
           systemd

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         # We will wrap manually later

     

       43
       43
       +
         dontWrapQtApps = true;

     

       44
       44
       +
       

     

       45
       45
       +
         cmakeFlags = [

     

       46
       46
       +
           (lib.cmakeBool "BUILD_WITH_QT6" isQt6)

     

       47
       47
       +
           "-DCONFIG_FILE=/etc/sddm.conf"

     

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

     

       49
       49
       +
       

     

       50
       50
       +
           # Set UID_MIN and UID_MAX so that the build script won't try

     

       51
       51
       +
           # to read them from /etc/login.defs (fails in chroot).

     

       52
       52
       +
           # The values come from NixOS; they may not be appropriate

     

       53
       53
       +
           # for running SDDM outside NixOS, but that configuration is

     

       54
       54
       +
           # not supported anyway.

     

       55
       55
       +
           "-DUID_MIN=1000"

     

       56
       56
       +
           "-DUID_MAX=29999"

     

       57
       57
       +
       

     

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

     

       59
       59
       +
           # occupied by getties by default

     

       60
       60
       +
           "-DSDDM_INITIAL_VT=7"

     

       61
       61
       +
       

     

       62
       62
       +
           "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"

     

       63
       63
       +
           "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"

     

       64
       64
       +
           "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"

     

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

     

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

     

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

     

       68
       68
       +
         ];

     

       69
       69
       +
       

     

       70
       70
       +
         postInstall = ''

     

       71
       71
       +
           # remove empty scripts

     

       72
       72
       +
           rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"

     

       73
       73
       +
           for f in $out/share/sddm/themes/**/theme.conf ; do

     

       74
       74
       +
             substituteInPlace $f \

     

       75
       75
       +
               --replace 'background=' "background=$(dirname $f)/"

     

       76
       76
       +
           done

     

       77
       77
       +
         '';

     

       78
       78
       +
       

     

       79
       79
       +
         meta = with lib; {

     

       80
       80
       +
           description = "QML based X11 display manager";

     

       81
       81
       +
           homepage    = "https://github.com/sddm/sddm";

     

       82
       82
       +
           maintainers = with maintainers; [ abbradar ttuegel k900 ];

     

       83
       83
       +
           platforms   = platforms.linux;

     

       84
       84
       +
           license     = licenses.gpl2Plus;

     

       85
       85
       +
         };

     

       86
       86
       +
       }