summary refs log tree commit diff
path: root/pkgs/applications/display-managers
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-10-06 22:45:50 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-10-06 22:54:33 -0500
commit6a80bb95f79b61b1fe516b9b9a55fcec96835fcd (patch)
treee8574df2da8a895028481871383f2d95056f5c58 /pkgs/applications/display-managers
parentc7d0f8b3b52d8153f302bd564c31467b55bd646d (diff)
downloadnixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar.gz
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar.bz2
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar.lz
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar.xz
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.tar.zst
nixlib-6a80bb95f79b61b1fe516b9b9a55fcec96835fcd.zip
sddm: ignore config file modification time
Properly fixes #10211, wherein the config file was not being loaded
because it was considered too old. However, the modification time was
being compared against an uninitialized value; the semantics of the
uninitialized timestamp probably changed between Qt 5.4 and 5.5.
Diffstat (limited to 'pkgs/applications/display-managers')
-rw-r--r--pkgs/applications/display-managers/sddm/default.nix2
-rw-r--r--pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch16
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 5f8b13d29059..10bbaed9bbe9 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "09amr61srvl52nvxlqqgs9fzn33pc2gjv5hc83gxx43x6q2j19gg";
   };
 
+  patches = [ ./sddm-ignore-config-mtime.patch ];
+
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
new file mode 100644
index 000000000000..9edd9a7b5382
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
@@ -0,0 +1,16 @@
+diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
+index 6618455..5356e76 100644
+--- a/src/common/ConfigReader.cpp
++++ b/src/common/ConfigReader.cpp
+@@ -136,11 +136,6 @@ namespace SDDM {
+         QString currentSection = QStringLiteral(IMPLICIT_SECTION);
+ 
+         QFile in(m_path);
+-        QDateTime modificationTime = QFileInfo(in).lastModified();
+-        if (modificationTime <= m_fileModificationTime) {
+-            return;
+-        }
+-        m_fileModificationTime = modificationTime;
+ 
+         in.open(QIODevice::ReadOnly);
+         while (!in.atEnd()) {