From 0850ab6173773dd9c798b017ce862426b98e23e0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 31 Mar 2019 11:25:51 -0500
Subject: [PATCH] sddm: 0.18.0 -> 0.18.1

(cherry picked from commit 60a9e6177d8551fc22731efd71616de6e3debdae)
Hotfix for crashes when creating a user session.

https://github.com/sddm/sddm/blob/v0.18.1/ChangeLog
https://github.com/sddm/sddm/releases/tag/v0.18.1
---
 pkgs/applications/display-managers/sddm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 3de4067f55d5..b5d32493003d 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.18.0";
+  version = "0.18.1";
 
 in mkDerivation rec {
   name = "sddm-${version}";
@@ -13,7 +13,7 @@ in mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq";
+    sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq";
   };
 
   patches = [
@@ -41,11 +41,11 @@ in mkDerivation rec {
     # not supported anyway.
     "-DUID_MIN=1000"
     "-DUID_MAX=29999"
-  ];
 
-  preConfigure = ''
-    export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
-  '';
+    "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"
+    "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
+    "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
+  ];
 
   postInstall = ''
     # remove empty scripts