mixin.mk, distro.mk: move falkon to the distro itself

It is wrong to make it impossible to use the default browser
(firefox) for targets using mixin/regular-lxqt given the
caveat with setting a variable to X, then to Y, then to X
again through make targets (see e.g. bootloader feature's
README).
This commit is contained in:
Anton Midyukov 2019-01-11 11:27:01 +07:00 committed by Michael Shigorin
parent e42c9d8b2c
commit 89c65ba9a1
2 changed files with 3 additions and 3 deletions

View File

@ -99,8 +99,7 @@ mixin/regular-tde: +tde \
@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
use/browser/falkon use/x11/gtk/nm +nm
mixin/regular-lxqt: use/x11/lxqt use/x11/sddm 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

View File

@ -171,7 +171,8 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth; @:
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
use/browser/falkon; @:
distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
use/net-eth/dhcp use/efi/refind; @: