diff --git a/srcpkgs/lightdm/files/lightdm.service b/srcpkgs/lightdm/files/lightdm.service index 951d3518b4e..0102670b237 100644 --- a/srcpkgs/lightdm/files/lightdm.service +++ b/srcpkgs/lightdm/files/lightdm.service @@ -1,7 +1,6 @@ [Unit] Description=Light Display Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service +After=systemd-user-sessions.service [Service] ExecStart=/usr/sbin/lightdm --log-dir=/var/log/lightdm --run-dir=/run/lightdm \ diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template index 4b7e6f90556..352b4cba5c0 100644 --- a/srcpkgs/lightdm/liblightdm-gobject.template +++ b/srcpkgs/lightdm/liblightdm-gobject.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the GObject support library for LightDM." - do_install() { vmove "usr/lib/liblightdm-gobject*.so*" usr/lib vmove usr/lib/girepository-1.0 usr/lib diff --git a/srcpkgs/lightdm/liblightdm-qt.template b/srcpkgs/lightdm/liblightdm-qt.template index e4101204a3a..5e8bad1e453 100644 --- a/srcpkgs/lightdm/liblightdm-qt.template +++ b/srcpkgs/lightdm/liblightdm-qt.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the QT support library for LightDM." - do_install() { vmove "usr/lib/liblightdm-qt*.so*" usr/lib } diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index e73900d627b..402a7c906d8 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.2.2 -revision=3 +revision=4 homepage="https://launchpad.net/lightdm" distfiles="https://launchpad.net/lightdm/1.2/$version/+download/$pkgname-$version.tar.gz" build_style=gnu-configure @@ -35,12 +35,8 @@ system_accounts="lightdm" lightdm_homedir="/var/cache/lightdm" systemd_services="lightdm.service off" make_dirs="/var/cache/lightdm 0755 lightdm lightdm" - subpackages="liblightdm-gobject liblightdm-qt lightdm-devel" - - - post_install() { # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init