aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xdisorg.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-02-25 13:50:19 -0500
committerMark H Weaver <mhw@netris.org>2016-02-25 13:50:19 -0500
commite62b5c690317ec6c5e35ce267b5c683bbd320342 (patch)
treef66227a16c9659f111aff5c5506f5494e5af1b7f /gnu/packages/xdisorg.scm
parent0767f6a69e96185a9a8c6377ac946037b966d4c7 (diff)
parentbf6996c9cf94627f7c116dc0b9923fe0bf942663 (diff)
downloadguix-e62b5c690317ec6c5e35ce267b5c683bbd320342.tar
guix-e62b5c690317ec6c5e35ce267b5c683bbd320342.tar.gz
Merge branch 'media-updates'
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r--gnu/packages/xdisorg.scm16
1 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 46fccfebbe..f01e17a23f 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -626,19 +626,21 @@ Escape key when Left Control is pressed and released on its own.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("glib" ,glib)
- ("gtk+" ,gtk+)
+ `(("gtk+" ,gtk+)
("libgudev" ,libgudev)
("eudev" ,eudev)
("libxml2" ,libxml2)))
+ (propagated-inputs
+ ;; libwacom includes header files that include GLib, and libinput uses
+ ;; those header files.
+ `(("glib" ,glib)))
(home-page "http://linuxwacom.sourceforge.net/")
(synopsis "Helper library for Wacom tablet settings")
(description
- "Libwacom is a library to help implement Wacom tablet settings. It
-is intended to be used by client-programs that need model identification. It
-is already being used by the gnome-settings-daemon and the GNOME 3.4 Control
-Center Wacom tablet applet. In the future, the xf86-input-wacom driver may
-use it as well.")
+ "Libwacom is a library to help implement Wacom tablet settings. It is
+intended to be used by client-programs that need model identification. It is
+already being used by the gnome-settings-daemon and the GNOME Control Center
+Wacom tablet applet.")
(license license:x11)))
(define-public xf86-input-wacom