diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/mate.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/mate.scm')
| -rw-r--r-- | gnu/packages/mate.scm | 87 |
1 files changed, 45 insertions, 42 deletions
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 03dfabc135..ce62366985 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1490,48 +1490,51 @@ used to bring up authentication dialogs.") (native-inputs (list desktop-file-utils)) (inputs ;; TODO: Add more packages - `(("at-spi2-core" ,at-spi2-core) - ("atril" ,atril) - ("caja" ,caja) - ("dbus" ,dbus) - ("dconf" ,dconf) - ("engrampa" ,engrampa) - ("eom" ,eom) - ("font-abattis-cantarell" ,font-abattis-cantarell) - ("glib-networking" ,glib-networking) - ("gnome-keyring" ,gnome-keyring) - ("gvfs" ,gvfs) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libmatekbd" ,libmatekbd) - ("libmateweather" ,libmateweather) - ("libmatemixer" ,libmatemixer) - ("marco" ,marco) - ("mate-session-manager" ,mate-session-manager) - ("mate-settings-daemon" ,mate-settings-daemon) - ("mate-desktop" ,mate-desktop) - ("mate-terminal" ,mate-terminal) - ("mate-themes" ,mate-themes) - ("mate-icon-theme" ,mate-icon-theme) - ("mate-power-manager" ,mate-power-manager) - ("mate-menu" ,mate-menus) - ("mate-panel" ,mate-panel) - ("mate-control-center" ,mate-control-center) - ("mate-media" ,mate-media) - ("mate-applets" ,mate-applets) - ("mate-user-guide" ,mate-user-guide) - ("mate-calc" ,mate-calc) - ("mate-backgrounds" ,mate-backgrounds) - ("mate-netbook" ,mate-netbook) - ("mate-utils" ,mate-utils) - ("mate-polkit" ,mate-polkit) - ("mate-system-monitor" ,mate-system-monitor) - ("mate-utils" ,mate-utils) - ("pluma" ,pluma) - ("pinentry-gnome3" ,pinentry-gnome3) - ("pulseaudio" ,pulseaudio) - ("shared-mime-info" ,shared-mime-info) - ("yelp" ,yelp) - ("zenity" ,zenity))) + (append (if (or (%current-target-system) + (supported-package? gnome-keyring)) + (list gnome-keyring) + '()) + (list at-spi2-core + atril + caja + dbus + dconf + engrampa + eom + font-abattis-cantarell + glib-networking + gvfs + hicolor-icon-theme + libmatekbd + libmateweather + libmatemixer + marco + mate-session-manager + mate-settings-daemon + mate-desktop + mate-terminal + mate-themes + mate-icon-theme + mate-power-manager + mate-menus + mate-panel + mate-control-center + mate-media + mate-applets + mate-user-guide + mate-calc + mate-backgrounds + mate-netbook + mate-utils + mate-polkit + mate-system-monitor + mate-utils + pluma + pinentry-gnome3 + pulseaudio + shared-mime-info + yelp + zenity))) (propagated-inputs ;; Default font that applications such as IceCat require. (list font-dejavu)) |