From 1d3a80ac34b8e86ce796e43bebb314675331e30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 23 Aug 2025 20:01:33 +0800 Subject: [PATCH] Reapply "gnu: mate: Replace 'union-build' with 'propagated-inputs'." Now we can have both xfce and mate in a profile, since they have the same mate-polkit package. This reverts commit 230ad0e3370e7a7a927d54dff33d2cee8b6300f9. Change-Id: Iea3e1f30d3abea4eca42d7a7dd12b40291151b02 --- gnu/packages/mate.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index f9872373557..f9b0c3b2f41 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1632,19 +1632,8 @@ menu specification.") (version (package-version mate-desktop)) (source #f) (build-system trivial-build-system) - (arguments - `(#:modules ((guix build union)) - #:builder - (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (native-inputs (list desktop-file-utils)) - (inputs + (arguments '(#:builder (mkdir %output))) + (propagated-inputs ;; TODO: Add more packages (append (if (or (%current-target-system) (supported-package? gnome-keyring)) @@ -1656,9 +1645,11 @@ menu specification.") dbus dconf dconf-editor + desktop-file-utils engrampa eom font-abattis-cantarell + font-dejavu ;default font glib-networking gvfs hicolor-icon-theme @@ -1692,9 +1683,6 @@ menu specification.") shared-mime-info yelp zenity))) - (propagated-inputs - ;; Default font that applications such as IceCat require. - (list font-dejavu)) (synopsis "The MATE desktop environment") (home-page "https://mate-desktop.org/") (description