diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/compton.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/compton.scm')
| -rw-r--r-- | gnu/packages/compton.scm | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm index 2a5f3bff27..290e06478b 100644 --- a/gnu/packages/compton.scm +++ b/gnu/packages/compton.scm @@ -58,25 +58,21 @@ (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs - `(("dbus" ,dbus) - ("libconfig" ,libconfig) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("mesa" ,mesa) - ("xprop" ,xprop) - ("xwininfo" ,xwininfo))) + (list dbus + libconfig + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxinerama + libxrandr + libxrender + mesa + xprop + xwininfo)) (native-inputs - `(("asciidoc" ,asciidoc) - ("libdrm" ,libdrm) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("xorgproto" ,xorgproto))) + (list asciidoc libdrm pkg-config python xorgproto)) (arguments `(#:make-flags (list "CC=gcc" @@ -127,23 +123,21 @@ performance). (file-name (string-append "picom-" version)))) (build-system meson-build-system) (inputs - `(("dbus" ,dbus) - ("libconfig" ,libconfig) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libev" ,libev) - ("mesa" ,mesa) - ("xprop" ,xprop) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-image" ,xcb-util-image) - ("pixman" ,pixman) - ("uthash" ,uthash) - ("libxdg-basedir" ,libxdg-basedir) - ("pcre" ,pcre))) + (list dbus + libconfig + libx11 + libxext + libev + mesa + xprop + xcb-util-renderutil + xcb-util-image + pixman + uthash + libxdg-basedir + pcre)) (native-inputs - `(("asciidoc" ,asciidoc) - ("pkg-config" ,pkg-config) - ("xorgproto" ,xorgproto))) + (list asciidoc pkg-config xorgproto)) (arguments `(#:build-type "release" #:configure-flags '("-Dwith_docs=true"))) |