From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euMUx-0005pZ-87 for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euMUu-0003Eb-RM for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44899) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euMUu-0003EO-Mk for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1euMUu-0005J6-HO for guix-patches@gnu.org; Fri, 09 Mar 2018 13:12:04 -0500 Subject: [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs. Resent-Message-ID: From: Marius Bakke Date: Fri, 9 Mar 2018 19:11:06 +0100 Message-Id: <20180309181108.22888-7-mbakke@fastmail.com> In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com> References: <20180309181108.22888-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30761@debbugs.gnu.org * gnu/packages/freedesktop.scm (libinput)[native-inputs]: Move CAIRO and GTK+ ... [inputs]: ... here. Move LIBEVDEV, LIBWACOM and MTDEV ... [propagated-inputs]: ... here. (libinput-minimal): Adjust accordingly. --- gnu/packages/freedesktop.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 15e658da7..a323778ca 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -159,17 +159,18 @@ freedesktop.org project.") `(#:configure-flags '("-Ddocumentation=false"))) (native-inputs `(("check" ,check) - ("cairo" ,cairo) - ("gtk+" ,gtk+) ("pkg-config" ,pkg-config) ("valgrind" ,valgrind))) (propagated-inputs - `(("libudev" ,eudev))) ; required by libinput.pc - (inputs - `(("glib" ,glib) + `(;; In Requires.private of libinput.pc. ("libevdev" ,libevdev) - ("mtdev" ,mtdev) - ("libwacom" ,libwacom))) + ("libudev" ,eudev) + ("libwacom" ,libwacom) + ("mtdev" ,mtdev))) + (inputs + `(("cairo" ,cairo) + ("glib" ,glib) + ("gtk+" ,gtk+))) (home-page "https://www.freedesktop.org/wiki/Software/libinput/") (synopsis "Input devices handling library") (description @@ -180,12 +181,9 @@ other applications that need to directly deal with input devices.") (define-public libinput-minimal (package (inherit libinput) (name "libinput-minimal") - (native-inputs - (fold alist-delete (package-native-inputs libinput) - '("gtk+" "cairo"))) - (inputs - `(("libevdev" ,libevdev) - ("mtdev" ,mtdev))) + (inputs '()) + (propagated-inputs + (alist-delete "libwacom" (package-propagated-inputs libinput))) (arguments (substitute-keyword-arguments (package-arguments libinput) ((#:configure-flags flags ''()) -- 2.16.2