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/conky.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/conky.scm')
| -rw-r--r-- | gnu/packages/conky.scm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index ad4d396289..9843cbe3c0 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -74,20 +74,20 @@ (install-file "src/conky" bin)) #t))))) (inputs - `(("freetype" ,freetype) - ("imlib2" ,imlib2) - ("libx11" ,libx11) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxft" ,libxft) - ("libxinerama" ,libxinerama) - ("pulseaudio" ,pulseaudio) - ("lua" ,lua) - ("ncurses" ,ncurses) - ("curl" ,curl) - ("wireless-tools" ,wireless-tools))) + (list freetype + imlib2 + libx11 + libxdamage + libxext + libxft + libxinerama + pulseaudio + lua + ncurses + curl + wireless-tools)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (synopsis "Lightweight system monitor for X") (description "Conky is a lightweight system monitor for X that displays operating |