diff options
| author | Ioannis Koutras <ioannis.koutras@gmail.com> | 2016-09-16 11:13:45 +0300 |
|---|---|---|
| committer | Ioannis Koutras <ioannis.koutras@gmail.com> | 2016-09-16 15:09:18 +0300 |
| commit | d78e68b1a45de52715678a61eefad421a7ff4cf8 (patch) | |
| tree | d096f6891eea9ffe447ac74465b863b39c53b3e7 /pkgs/applications/display-managers | |
| parent | 0ffdb89d956c9daef80858c57040ffe2862164c6 (diff) | |
| download | nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar.gz nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar.bz2 nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar.lz nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar.xz nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.tar.zst nixlib-d78e68b1a45de52715678a61eefad421a7ff4cf8.zip | |
sddm: 0.13.0 -> 0.14.0
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch | 26 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 15 |
2 files changed, 7 insertions, 34 deletions
diff --git a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch b/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch deleted file mode 100644 index ad5dcbc472db..000000000000 --- a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7a18f4cb77c567dec9ad924fcc76c50092de6ee7 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 23 Nov 2015 06:57:51 -0600 -Subject: [PATCH 2/2] fix ConfigReader QStringList corruption - ---- - src/common/ConfigReader.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index 5bf5a6a..34182e6 100644 ---- a/src/common/ConfigReader.cpp -+++ b/src/common/ConfigReader.cpp -@@ -30,7 +30,8 @@ - - QTextStream &operator>>(QTextStream &str, QStringList &list) { - list.clear(); -- foreach(const QStringRef &s, str.readLine().splitRef(QLatin1Char(','))) -+ QString line = str.readLine(); -+ foreach(const QStringRef &s, line.splitRef(QLatin1Char(','))) - { - QStringRef trimmed = s.trimmed(); - if (!trimmed.isEmpty()) --- -2.6.3 - diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 923b185ae393..3f8d5aec4aa1 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,11 +1,11 @@ { stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, libxcb, libpthreadstubs, lndir +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , themes }: let - version = "0.13.0"; + version = "0.14.0"; unwrapped = stdenv.mkDerivation rec { name = "sddm-unwrapped-${version}"; @@ -14,19 +14,18 @@ let owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; + sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; }; patches = [ ./0001-ignore-config-mtime.patch - ./0002-fix-ConfigReader-QStringList-corruption.patch - (fetchpatch { - url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch; - sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj"; + (fetchpatch { /* Fix display of user avatars. */ + url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; + sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; }) ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd |