public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sddm: 0.13.0 -> 0.14.0

Browse Source
This commit is contained in:
Ioannis Koutras 2016-09-16 11:13:45 +03:00
parent 0ffdb89d95
commit d78e68b1a4
3 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -46,7 +46,7 @@ let
HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} HideUsers=${concatStringsSep "," dmcfg.hiddenUsers}
HideShells=/run/current-system/sw/bin/nologin HideShells=/run/current-system/sw/bin/nologin
[XDisplay] [X11]
MinimumVT=${toString xcfg.tty} MinimumVT=${toString xcfg.tty}
ServerPath=${xserverWrapper} ServerPath=${xserverWrapper}
XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr
@ -100,7 +100,7 @@ in
theme = mkOption { theme = mkOption {
type = types.str; type = types.str;
default = "maui"; default = "";
description = '' description = ''
Greeter theme to use. Greeter theme to use.
''; '';

26
pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch
View File

@ -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

15
pkgs/applications/display-managers/sddm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch { stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, libxcb, libpthreadstubs, lndir , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
, themes , themes
}: }:
let let
version = "0.13.0"; version = "0.14.0";
unwrapped = stdenv.mkDerivation rec { unwrapped = stdenv.mkDerivation rec {
name = "sddm-unwrapped-${version}"; name = "sddm-unwrapped-${version}";
@ -14,19 +14,18 @@ let
owner = "sddm"; owner = "sddm";
repo = "sddm"; repo = "sddm";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
}; };
patches = [ patches = [
./0001-ignore-config-mtime.patch ./0001-ignore-config-mtime.patch
./0002-fix-ConfigReader-QStringList-corruption.patch (fetchpatch { /* Fix display of user avatars. */
(fetchpatch { url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch; sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj";
}) })
]; ];
nativeBuildInputs = [ cmake pkgconfig qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [ buildInputs = [
libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd