mixin.mk, regular.mk: move sddm to distro/regular-lxqt

sddm doesn't work with sysvinit currently, so this mixin is not a good place to specify the display manager; and different platforms may have different needs, e.g. sddm has just stopped working on aarch64 boards.

mixin.mk, regular.mk: move sddm to distro/regular-lxqt
9488b53e · Anton Midyukov · Michael Shigorin · 86b2a33b · 9488b53e · 9488b53e
Commit 9488b53e authored Jun 09, 2019 by Anton Midyukov Committed by Michael Shigorin Jun 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mixin.mk conf.d/mixin.mk +1 -1

regular.mk conf.d/regular.mk +1 -1

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -98,7 +98,7 @@ mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm
 	@$(call add,THE_PACKAGES,qasmixer qpdfview)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm use/x11/gtk/nm +nm
+mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

 mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -155,7 +155,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)

 distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
-	use/browser/falkon
+	use/browser/falkon use/x11/sddm
 	@$(call add,THE_LISTS,$(call tags,lxqt desktop))

 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \