Commit 4fef361e authored by Anton Midyukov's avatar Anton Midyukov

mixin.mk: set THE_IMAGEWRITER=imression for regular-gnome if not p10

imression works well on GNOME.
parent 9b2ac5b4
...@@ -94,7 +94,7 @@ ifneq (,$(filter-out e2k%,$(ARCH))) ...@@ -94,7 +94,7 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_BRANDING,notes) @$(call add,THE_BRANDING,notes)
endif endif
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER)) @$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,altmediawriter) @$(call try,THE_IMAGEWRITER,altmediawriter)
@$(call add,THE_PACKAGES,upower udev-rules-rfkill-uaccess) @$(call add,THE_PACKAGES,upower udev-rules-rfkill-uaccess)
@$(call add,THE_PACKAGES,hunspell-ru-lebedev hunspell-en_US) @$(call add,THE_PACKAGES,hunspell-ru-lebedev hunspell-en_US)
@$(call add,THE_PACKAGES,glmark2 glmark2-es2) @$(call add,THE_PACKAGES,glmark2 glmark2-es2)
...@@ -131,11 +131,12 @@ mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm-gtk4 \ ...@@ -131,11 +131,12 @@ mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm-gtk4 \
@$(call add,THE_PACKAGES,power-profiles-daemon) @$(call add,THE_PACKAGES,power-profiles-daemon)
@$(call add,BASE_PACKAGES,gnome-software) @$(call add,BASE_PACKAGES,gnome-software)
@$(call add,BASE_PACKAGES,gnome-tour) @$(call add,BASE_PACKAGES,gnome-tour)
ifeq (,$(filter-out sisyphus p11,$(BRANCH))) ifneq (,$(filter-out p10,$(BRANCH)))
@$(call add,THE_PACKAGES,gnome-extension-manager) @$(call add,THE_PACKAGES,gnome-extension-manager)
@$(call add,PINNED_PACKAGES,gnome-console:Required) @$(call add,PINNED_PACKAGES,gnome-console:Required)
@$(call add,THE_PACKAGES,gnome-console) @$(call add,THE_PACKAGES,gnome-console)
@$(call add,THE_PACKAGES,papers) @$(call add,THE_PACKAGES,papers)
@$(call set,THE_IMAGEWRITER,impression)
else else
@$(call add,PINNED_PACKAGES,gnome-terminal:Required) @$(call add,PINNED_PACKAGES,gnome-terminal:Required)
@$(call add,THE_PACKAGES,gnome-terminal) @$(call add,THE_PACKAGES,gnome-terminal)
......
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