[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs.
From: |
Marius Bakke |
Subject: |
[bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs. |
Date: |
Fri, 9 Mar 2018 19:11:06 +0100 |
* 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
- [bug#30761] [PATCH staging 3/9] gnu: meson: Update to 0.45.0., (continued)
- [bug#30761] [PATCH staging 3/9] gnu: meson: Update to 0.45.0., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 8/9] gnu: libwacom: Update to 0.29., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 9/9] gnu: xf86-input-wacom: Update to 0.36.0., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 2/9] gnu: meson-for-build: Update to 0.44.0., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs.,
Marius Bakke <=
- [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable., Marius Bakke, 2018/03/09
- [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable., Ludovic Courtès, 2018/03/11
- [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable., Ludovic Courtès, 2018/03/12
- [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable., Marius Bakke, 2018/03/12
- [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable., Ludovic Courtès, 2018/03/12