From c6deabf957c0f5b68b45a2db0b4a35112c52c29e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 31 Mar 2019 23:14:46 +0200 Subject: gnu: libinput: Do not propagate any inputs. These inputs are no longer listed in the pkg-config files. * gnu/packages/freedesktop.scm (libinput)[propagated-inputs]: Remove. [inputs]: Add LIBEVDEV, EUDEV, LIBWACOM, and MTDEV. (libinput-minimal)[inputs, propagated-inputs]: Adjust accordingly. --- gnu/packages/freedesktop.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 00d519b306..381a9506d7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -164,16 +164,14 @@ (define-public libinput `(("check" ,check) ("pkg-config" ,pkg-config) ("valgrind" ,valgrind))) - (propagated-inputs - `(;; In Requires.private of libinput.pc. + (inputs + `(("cairo" ,cairo) + ("glib" ,glib) + ("gtk+" ,gtk+) ("libevdev" ,libevdev) ("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 @@ -184,9 +182,9 @@ (define-public libinput (define-public libinput-minimal (package (inherit libinput) (name "libinput-minimal") - (inputs '()) - (propagated-inputs - (alist-delete "libwacom" (package-propagated-inputs libinput))) + (inputs + (fold alist-delete (package-inputs libinput) + '("cairo" "glib" "gtk+" "libwacom"))) (arguments (substitute-keyword-arguments (package-arguments libinput) ((#:configure-flags flags ''()) -- cgit v1.2.3