summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-31 23:14:46 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-04-01 01:32:40 +0200
commitc6deabf957c0f5b68b45a2db0b4a35112c52c29e (patch)
tree03a0b9c9a3d9c78eb371a6e2355a0ef210c329d9 /gnu/packages
parent6918c6a909231566616e48105dd8d2f9cf542850 (diff)
downloadguix-c6deabf957c0f5b68b45a2db0b4a35112c52c29e.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/freedesktop.scm16
1 files changed, 7 insertions, 9 deletions
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 @@ freedesktop.org project.")
      `(("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 @@ other applications that need to directly deal with input devices.")
 (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 ''())