mixin.mk: update mixin/regular-gnome

554b2ea6 · Anton Midyukov · a41107d6 · 554b2ea6
Commit 554b2ea6 authored Dec 09, 2024 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

mixin.mk conf.d/mixin.mk +8 -4

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -136,14 +136,18 @@ mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
 mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm-gtk4 \
 	use/domain-client
 	@$(call add,THE_PACKAGES,power-profiles-daemon)
-	@$(call add,THE_PACKAGES,gnome-terminal)
 	@$(call add,THE_PACKAGES,gnome-software)
 	@$(call add,THE_PACKAGES,gnome-tour)
-ifeq (,$(filter-out sisyphus,$(BRANCH)))
+ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
 	@$(call add,THE_PACKAGES,gnome-extensions-app)
-endif
-	@$(call add,THE_PACKAGES,evince)
+	@$(call add,PINNED_PACKAGES,gnome-console:Required)
+	@$(call add,THE_PACKAGES,gnome-console)
+	@$(call add,THE_PACKAGES,papers)
+else
 	@$(call add,PINNED_PACKAGES,gnome-terminal:Required)
+	@$(call add,THE_PACKAGES,gnome-terminal)
+	@$(call add,THE_PACKAGES,evince)
+endif
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
 	@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
 	@$(call add,THE_PACKAGES,cups-pk-helper cups)