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/openbox.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/openbox.scm')
| -rw-r--r-- | gnu/packages/openbox.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 00c93c3864..873592c19e 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:select (gpl2+)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -47,19 +48,19 @@ (base32 "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (propagated-inputs `(("python2-pyxdg" ,python2-pyxdg))) - (inputs `(("imlib2" ,imlib2) - ("libxml2" ,libxml2) - ("librsvg" ,librsvg) - ("libsm" ,libsm) - ("libxcursor" ,libxcursor) - ("libxinerama" ,libxinerama) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxft" ,libxft) - ("pango" ,pango) - ("python-2" ,python-2))) + (native-inputs (list pkg-config)) + (propagated-inputs (list python2-pyxdg)) + (inputs (list imlib2 + libxml2 + (librsvg-for-system) + libsm + libxcursor + libxinerama + libxml2 + libxrandr + libxft + pango + python-2)) (synopsis "Box style window manager") (description "Openbox is a highly configurable, next generation window manager with |