diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/cinnamon.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/cinnamon.scm')
| -rw-r--r-- | gnu/packages/cinnamon.scm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index e1c9d7b614..fe33e797e4 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -53,24 +53,24 @@ (build-system gnu-build-system) ;; TODO: package 'libgsystem'. (inputs - `(("accountsservice" ,accountsservice) - ("gtk+" ,gtk+) - ("glib" ,glib) - ("gobject-introspection" ,gobject-introspection) - ("gnome-common" ,gnome-common) - ("libxkbfile" ,libxkbfile) - ("libxrandr" ,libxrandr) - ("python-2" ,python-2) - ("pulseaudio" ,pulseaudio) - ("xkeyboard-config" ,xkeyboard-config))) + (list accountsservice + gtk+ + glib + gobject-introspection + gnome-common + libxkbfile + libxrandr + python-2 + pulseaudio + xkeyboard-config)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-gettextize - ("intltool" ,intltool) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list autoconf + automake + gettext-minimal + `(,glib "bin") ; glib-gettextize + intltool + libtool + pkg-config)) (home-page "https://github.com/linuxmint/cinnamon-desktop/") (synopsis "Library for the Cinnamon Desktop") (description |