sddm: 0.20.0-unstable -> 0.21.0

3 files changed, 17 insertions, 35 deletions

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 0e09fd43f0c60..d565d2d1213fe 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -29,6 +29,6 @@ runCommand "sddm-wrapped" {
   done
 
   for i in bin/*; do
-    makeQtWrapper ${unwrapped}/$i $out/$i --set SDDM_GREETER $out/bin/sddm-greeter
+    makeQtWrapper ${unwrapped}/$i $out/$i --set SDDM_GREETER_DIR $out/bin
   done
 ''
diff --git a/pkgs/applications/display-managers/sddm/greeter-path.patch b/pkgs/applications/display-managers/sddm/greeter-path.patch
index d8dbc8b30647f..b314108952a98 100644
--- a/pkgs/applications/display-managers/sddm/greeter-path.patch
+++ b/pkgs/applications/display-managers/sddm/greeter-path.patch
@@ -1,32 +1,14 @@
 diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
-index c0437ae..f814146 100644
+index 07fccde..dd22a07 100644
 --- a/src/daemon/Greeter.cpp
 +++ b/src/daemon/Greeter.cpp
-@@ -85,6 +85,9 @@ namespace SDDM {
-         if (m_started)
-             return false;
- 
-+        // Nixpkgs: use wrapped greeter if available
-+        QString greeter = qEnvironmentVariable("SDDM_GREETER", QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR)));
-+
-         // themes
-         QString xcursorTheme = mainConfig.Theme.CursorTheme.get();
-         if (m_themeConfig->contains(QLatin1String("cursorTheme")))
-@@ -139,7 +142,7 @@ namespace SDDM {
-                 m_process->setProcessEnvironment(env);
-             }
-             // Greeter command
--            m_process->start(QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR)), args);
-+            m_process->start(greeter, args);
- 
-             //if we fail to start bail immediately, and don't block in waitForStarted
-             if (m_process->state() == QProcess::NotRunning) {
-@@ -173,7 +176,7 @@ namespace SDDM {
- 
-             // command
-             QStringList cmd;
--            cmd << QStringLiteral("%1/sddm-greeter").arg(QStringLiteral(BIN_INSTALL_DIR))
-+            cmd << greeter
-                 << args;
- 
-             // greeter environment
+@@ -83,7 +83,8 @@ namespace SDDM {
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+         const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
++        const QString greeterDir = qEnvironmentVariable("SDDM_GREETER_DIR", QStringLiteral(BIN_INSTALL_DIR));
++        return QStringLiteral("%1/sddm-greeter%2").arg(greeterDir).arg(suffix);
+     }
+ 
+     bool Greeter::start() {
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index a18c33b0f20b4..430e62a5ef4a4 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -5,15 +5,15 @@
 }:
 let
   isQt6 = lib.versions.major qtbase.version == "6";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation(finalAttrs: {
   pname = "sddm-unwrapped";
-  version = "0.20.0-unstable-2023-12-29";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "sddm";
     repo = "sddm";
-    rev = "501129294be1487f753482c29949fc1c19ef340e";
-    hash = "sha256-mLm987Ah0X9s0tBK2a45iERwYoh5JzWb3TFlSoxi8CA=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-r5mnEWham2WnoEqRh5tBj/6rn5mN62ENOCmsLv2Ht+w=";
   };
 
   patches = [
@@ -83,4 +83,4 @@ in stdenv.mkDerivation {
     platforms   = platforms.linux;
     license     = licenses.gpl2Plus;
   };
-}
+})