From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH 2/4] gnu: gnome-settings-daemon: Use wacom packages. Date: Tue, 7 Apr 2015 19:37:29 +0200 Message-ID: <1429087547.287372.30140@badger> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiIxG-0004Of-Bo for guix-devel@gnu.org; Wed, 15 Apr 2015 04:46:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiIxA-0000Ik-Aw for guix-devel@gnu.org; Wed, 15 Apr 2015 04:45:54 -0400 Received: from pb-sasl1.int.icgroup.com ([208.72.237.25]:50459 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiIxA-0000If-78 for guix-devel@gnu.org; Wed, 15 Apr 2015 04:45:48 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id E133244877 for ; Wed, 15 Apr 2015 04:45:47 -0400 (EDT) Received: from pb-sasl1.int.icgroup.com (unknown [127.0.0.1]) by pb-sasl1.pobox.com (Postfix) with ESMTP id C2FCF44876 for ; Wed, 15 Apr 2015 04:45:47 -0400 (EDT) Received: from badger (unknown [88.160.190.192]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl1.pobox.com (Postfix) with ESMTPSA id D7BEF44874 for ; Wed, 15 Apr 2015 04:45:46 -0400 (EDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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