[PATCH 2/4] gnu: gnome-settings-daemon: Use wacom packages.

[PATCH 2/4] gnu: gnome-settings-daemon: Use wacom packages.

[Andy Wingo]

* gnu/packages/gnome.scm (gnome-settings-daemon): Use the wacom packages.
---
 gnu/packages/gnome.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e7f854d..92e8e64 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -62,6 +62,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages wacom)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
@@ -2145,17 +2146,7 @@ services for numerous locations.")
          "1w29x2izq59125ga5ncmmaklc8kw7x7rdn6swn26bs23mah1r1g3"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; libwacom and xorg-wacom not yet packaged.  Hackily disable by
-         ;; pretending to be s390 (!).
-         (add-before
-          'configure 'disable-wacom
-          (lambda _
-            (substitute* "configure"
-              (("if test \"\\$host_cpu\" = s390 -o \"\\$host_cpu\" = s390x")
-               "if true")))))
-       ;; Network manager not yet packaged.
+     `(;; Network manager not yet packaged.
        #:configure-flags '("--disable-network-manager")
        ;; Color management test can't reach the colord system service.
        #:tests? #f))
@@ -2183,7 +2174,10 @@ services for numerous locations.")
        ("gnome-desktop" ,gnome-desktop)
        ("nss" ,nss)
        ("cups" ,cups)
-       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+       ("libwacom" ,libwacom)
+       ("librsvg" ,librsvg)
+       ("xf86-input-wacom" ,xf86-input-wacom)))
     (home-page "http://www.gnome.org")
     (synopsis "GNOME settings daemon")
     (description
-- 
2.2.1

Re: [PATCH 2/4] gnu: gnome-settings-daemon: Use wacom packages.

[Ludovic Courtès]

Andy Wingo <wingo@pobox.com> skribis:

> * gnu/packages/gnome.scm (gnome-settings-daemon): Use the wacom packages.

Applied, thanks!

Ludo’.