From 1a5cf0b8c2e2ed61e8290616daa5d1cc8c554896 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 9 Nov 2014 10:43:22 +0100
Subject: [PATCH] lightdm: create required dirs in the runit service instead;
 fix session wrapper.

---
 srcpkgs/lightdm/files/lightdm/run | 2 ++
 srcpkgs/lightdm/template          | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lightdm/files/lightdm/run b/srcpkgs/lightdm/files/lightdm/run
index 67da73372f1..60fab78dec1 100755
--- a/srcpkgs/lightdm/files/lightdm/run
+++ b/srcpkgs/lightdm/files/lightdm/run
@@ -3,4 +3,6 @@ sv check dbus >/dev/null || exit 1
 [ ! -d /run/lightdm ] && mkdir -p /run/lightdm
 chmod 0711 /run/lightdm
 chown lightdm:lightdm /run/lightdm
+mkdir -p /var/lib/lightdm /var/lib/lightm-data
+chown -R lightdm:lightdm /var/lib/lightdm /var/lib/lightdm-data
 exec lightdm
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 4ad8d26cf98..001c3867bf3 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -27,10 +27,6 @@ conf_files="
 	/etc/pam.d/lightdm-autologin"
 system_accounts="lightdm"
 lightdm_homedir="/var/lib/lightdm"
-make_dirs="
- /var/lib/lightdm 0755 lightdm lightdm
- /var/lib/lightdm-data 0755 lightdm lightdm"
-
 
 post_install() {
 	# Remove provided init file and use our own.
@@ -47,6 +43,7 @@ post_install() {
 		sed 's|\(.*pam_systemd.*\)|-\1|' -i $f
 		echo "-session optional pam_ck_connector.so nox11" >> $f
 	done
+	sed 's|\#session-wrapper=.*|session-wrapper=/etc/lightdm/Xsession|' -i ${DESTDIR}/etc/lightdm/lightdm.conf
 }
 
 liblightdm-gobject_package() {