Skip to content

M
mkimage-profiles
Commit 401442ed authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin
Browse files
Options

mixin.mk, regular.mk: add +nm-gtk to gtk-based regular builds

...to extend the supported protocols list as suggested. See-also: b869d365f195a7070f1f6c425795b4c058b18c6c
parent 2ff268ec
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
conf.d/mixin.mk
View file @ 401442ed
...@@ -70,7 +70,7 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \ ...@@ -70,7 +70,7 @@ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
@$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb) @$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru xxkb)
@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome) @$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
@$(call add,THE_LISTS,$(call tags,regular icewm)) @$(call add,THE_LISTS,$(call tags,regular icewm))
@$(call add,THE_LISTS,$(call tags,desktop nm)) @$(call add,THE_LISTS,$(call tags,desktop nm))
@$(call add,THE_PACKAGES,icewm-startup-networkmanager) @$(call add,THE_PACKAGES,icewm-startup-networkmanager)
...@@ -80,7 +80,7 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm ...@@ -80,7 +80,7 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm
mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck
@$(call add,THE_BRANDING,graphics) @$(call add,THE_BRANDING,graphics)
mixin/regular-cinnamon: use/x11/cinnamon \ mixin/regular-cinnamon: use/x11/cinnamon +nm-gtk \
use/fonts/ttf/google use/net/nm/mmgui use/im; @: use/fonts/ttf/google use/net/nm/mmgui use/im; @:
mixin/regular-kde5: use/x11/kde5 use/browser/falkon \ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
...@@ -89,7 +89,7 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \ ...@@ -89,7 +89,7 @@ mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5) @$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/xfce-base: use/x11/xfce use/x11/gtk/nm +nm \ mixin/xfce-base: use/x11/xfce +nm-gtk \
use/fonts/ttf/redhat use/fonts/ttf/google/extra use/fonts/ttf/redhat use/fonts/ttf/google/extra
@$(call add,THE_PACKAGES,xfce-polkit) @$(call add,THE_PACKAGES,xfce-polkit)
@$(call add,THE_BRANDING,xfce-settings) @$(call add,THE_BRANDING,xfce-settings)
...@@ -105,18 +105,17 @@ mixin/regular-xfce-sysv: mixin/xfce-base \ ...@@ -105,18 +105,17 @@ mixin/regular-xfce-sysv: mixin/xfce-base \
@$(call add,THE_PACKAGES,xfce4-screensaver) @$(call add,THE_PACKAGES,xfce4-screensaver)
@$(call add,THE_PACKAGES,sysstat leafpad) @$(call add,THE_PACKAGES,sysstat leafpad)
@$(call add,THE_PACKAGES,nload) @$(call add,THE_PACKAGES,nload)
@$(call add,THE_PACKAGES,NetworkManager-l2tp-gtk)
@$(call add,THE_PACKAGES,NetworkManager-tui) @$(call add,THE_PACKAGES,NetworkManager-tui)
mixin/regular-lxde: use/x11/lxde use/x11/gtk/nm use/im +nm mixin/regular-lxde: use/x11/lxde use/im +nm-gtk
@$(call add,THE_LISTS,$(call tags,desktop gvfs)) @$(call add,THE_LISTS,$(call tags,desktop gvfs))
@$(call add,THE_PACKAGES,qasmixer qpdfview) @$(call add,THE_PACKAGES,qasmixer qpdfview)
@$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/regular-lxqt: use/x11/lxqt use/x11/gtk/nm +nm mixin/regular-lxqt: use/x11/lxqt +nm-gtk
@$(call set,THE_IMAGEWRITER,rosa-imagewriter) @$(call set,THE_IMAGEWRITER,rosa-imagewriter)
mixin/mate-base: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm mixin/mate-base: use/x11/mate use/fonts/ttf/google +nm-gtk
@$(call add,THE_LISTS,$(call tags,mobile mate)) @$(call add,THE_LISTS,$(call tags,mobile mate))
mixin/regular-mate: mixin/mate-base use/domain-client mixin/regular-mate: mixin/mate-base use/domain-client
......
conf.d/regular.mk
View file @ 401442ed
...@@ -152,7 +152,7 @@ distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \ ...@@ -152,7 +152,7 @@ distro/regular-enlightenment-sysv: distro/.regular-sysv-gtk \
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @: distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @:
# not .regular-gtk due to gdm vs lightdm # not .regular-gtk due to gdm vs lightdm
distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm-gtk \
use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done) @$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment