mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Revert "gnu: mate: Replace 'union-build' with 'propagated-inputs'."
This reverts commit b7a8f886f5
because it breaks
system tests as discussed here: https://issues.guix.gnu.org/48265.
Change-Id: Ib00696db10475e049ada892004c1164933a78066
This commit is contained in:
parent
5a608171bc
commit
230ad0e337
1 changed files with 16 additions and 4 deletions
|
@ -1586,8 +1586,19 @@ menu specification.")
|
||||||
(version (package-version mate-desktop))
|
(version (package-version mate-desktop))
|
||||||
(source #f)
|
(source #f)
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(arguments '(#:builder (mkdir %output)))
|
(arguments
|
||||||
(propagated-inputs
|
`(#: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
|
||||||
;; TODO: Add more packages
|
;; TODO: Add more packages
|
||||||
(append (if (or (%current-target-system)
|
(append (if (or (%current-target-system)
|
||||||
(supported-package? gnome-keyring))
|
(supported-package? gnome-keyring))
|
||||||
|
@ -1599,11 +1610,9 @@ menu specification.")
|
||||||
dbus
|
dbus
|
||||||
dconf
|
dconf
|
||||||
dconf-editor
|
dconf-editor
|
||||||
desktop-file-utils
|
|
||||||
engrampa
|
engrampa
|
||||||
eom
|
eom
|
||||||
font-abattis-cantarell
|
font-abattis-cantarell
|
||||||
font-dejavu ;default font
|
|
||||||
glib-networking
|
glib-networking
|
||||||
gvfs
|
gvfs
|
||||||
hicolor-icon-theme
|
hicolor-icon-theme
|
||||||
|
@ -1637,6 +1646,9 @@ menu specification.")
|
||||||
shared-mime-info
|
shared-mime-info
|
||||||
yelp
|
yelp
|
||||||
zenity)))
|
zenity)))
|
||||||
|
(propagated-inputs
|
||||||
|
;; Default font that applications such as IceCat require.
|
||||||
|
(list font-dejavu))
|
||||||
(synopsis "The MATE desktop environment")
|
(synopsis "The MATE desktop environment")
|
||||||
(home-page "https://mate-desktop.org/")
|
(home-page "https://mate-desktop.org/")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue