Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

5 files changed, 37 insertions, 74 deletions

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index dc50ced1a606..968dd7ab9912 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -6,14 +6,14 @@
 
 let
   ver_branch = "1.16";
-  version = "1.16.2";
+  version = "1.16.5";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq";
+    sha256 = "1qb3gvwdm2rymwn8rb1qc4gyam226xmvy2fq5rvmrcmgxblmi34c";
   };
 
   patches = [ ./fix-paths.patch ];
diff --git a/pkgs/applications/display-managers/sddm/cmake_paths.patch b/pkgs/applications/display-managers/sddm/cmake_paths.patch
deleted file mode 100644
index 7deb3e2e1bd9..000000000000
--- a/pkgs/applications/display-managers/sddm/cmake_paths.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d6e0a9..df4ad28 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,9 @@ find_package(Qt5LinguistTools REQUIRED)
- 
- # find qt5 imports dir
- get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
--exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
-+if(NOT QT_IMPORTS_DIR)
-+    exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
-+endif()
- 
- # Set components version
- set(COMPONENTS_VERSION 2.0)
-diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
-index 6a28224..798bc5c 100644
---- a/data/man/sddm.conf.rst.in
-+++ b/data/man/sddm.conf.rst.in
-@@ -65,6 +65,10 @@ OPTIONS
- 	Path of the X server.
- 	Default value is "/usr/bin/X".
- 
-+`XephyrPath=`
-+	Path of the Xephyr.
-+	Default value is "/usr/bin/Xephyr".
-+
- `XauthPath=`
- 	Path of the Xauth.
- 	Default value is "/usr/bin/xauth".
-diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index 72aa6f4..854cc22 100644
---- a/src/common/Configuration.h
-+++ b/src/common/Configuration.h
-@@ -54,6 +54,7 @@ namespace SDDM {
-         // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
-         Section(XDisplay,
-             Entry(ServerPath,          QString,     _S("/usr/bin/X"),                           _S("X server path"));
-+            Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Xephyr path"));
-             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Xauth path"));
-             Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Session description directory"));
-             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Xsession script path\n"
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index f10ad82..cb9de3f 100644
---- a/src/daemon/XorgDisplayServer.cpp
-+++ b/src/daemon/XorgDisplayServer.cpp
-@@ -136,7 +136,7 @@ namespace SDDM {
-         if (daemonApp->testing()) {
-             QStringList args;
-             args << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
--            process->start("/usr/bin/Xephyr", args);
-+            process->start(mainConfig.XDisplay.XephyrPath.get(), args);
-         } else {
-             // set process environment
-             QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 82cd8bd3091e..5851f1af6390 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb
-, libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam
-, systemd
-}:
+{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
+, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
 
 let
-  version = "0.11.0";
+  version = "0.13.0";
 in
 stdenv.mkDerivation rec {
   name = "sddm-${version}";
@@ -13,21 +11,25 @@ stdenv.mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig";
+    sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig qttools ];
+  patches = [ ./sddm-ignore-config-mtime.patch ];
 
-  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
 
-  patches = [ (fetchpatch {
-                url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch";
-                sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l";
-              })
-              ./cmake_paths.patch
-            ];
+  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
 
-  cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" ];
+  cmakeFlags = [
+    "-DCONFIG_FILE=/etc/sddm.conf"
+    # Set UID_MIN and UID_MAX so that the build script won't try
+    # to read them from /etc/login.defs (fails in chroot).
+    # The values come from NixOS; they may not be appropriate
+    # for running SDDM outside NixOS, but that configuration is
+    # not supported anyway.
+    "-DUID_MIN=1000"
+    "-DUID_MAX=29999"
+  ];
 
   preConfigure = ''
     export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
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()) {
diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix
index 0c69f1018854..b1be24f3e1d6 100644
--- a/pkgs/applications/display-managers/slim/themes.nix
+++ b/pkgs/applications/display-managers/slim/themes.nix
@@ -176,8 +176,8 @@ in {
   nixosSlim = buildTheme {
     fullName = "nixos-slim";
     src = fetchurl {
-      url = "https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz";
-      sha256 = "66c3020a6716130a20c3898567339b990fbd7888a3b7bbcb688f6544d1c05c31";
+      url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
+      sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
     };
   };
 }