summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-07 19:37:29 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-18 22:57:52 +0200
commitec2b19210f0861ecb0207e618dabd5c066ba43b3 (patch)
treeb5342b228d3270ca2d1c1398d22a99e699462c82 /gnu
parentab42a2a7272d7925c30a69e770f0e3281c1a7a2b (diff)
downloadguix-ec2b19210f0861ecb0207e618dabd5c066ba43b3.tar.gz
gnu: gnome-settings-daemon: Use wacom packages.
* gnu/packages/gnome.scm (gnome-settings-daemon): Use the wacom packages.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gnome.scm17
1 files changed, 5 insertions, 12 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f508ba9cbb..33ce2e8717 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2148,17 +2148,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))
@@ -2186,7 +2176,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