From: Marius Bakke <mbakke@fastmail.com>
To: 30761@debbugs.gnu.org
Subject: [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs.
Date: Fri, 9 Mar 2018 19:11:06 +0100 [thread overview]
Message-ID: <20180309181108.22888-7-mbakke@fastmail.com> (raw)
In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com>
* 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
next prev parent reply other threads:[~2018-03-09 18:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 18:09 [bug#30761] [PATCH staging 0/9] Meson fixes (and some updates) Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 2/9] gnu: meson-for-build: Update to 0.44.0 Marius Bakke
2018-03-11 22:18 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 3/9] gnu: meson: Update to 0.45.0 Marius Bakke
2018-03-11 22:18 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 4/9] build-system/meson: Add the output directory to RUNPATH Marius Bakke
2018-03-11 22:23 ` Ludovic Courtès
2018-03-12 13:04 ` Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 5/9] build-system/meson: Skip the 'fix-runpath' phase on armhf Marius Bakke
2018-03-11 22:24 ` Ludovic Courtès
2018-03-12 13:05 ` Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 6/9] gnu: libinput: Update to 1.10.2 Marius Bakke
2018-03-11 22:25 ` Ludovic Courtès
2018-03-09 18:11 ` Marius Bakke [this message]
2018-03-11 22:25 ` [bug#30761] [PATCH staging 7/9] gnu: libinput: Correct inputs Ludovic Courtès
2018-03-12 13:20 ` Marius Bakke
2018-03-09 18:11 ` [bug#30761] [PATCH staging 8/9] gnu: libwacom: Update to 0.29 Marius Bakke
2018-03-11 22:26 ` Ludovic Courtès
2018-03-09 18:11 ` [bug#30761] [PATCH staging 9/9] gnu: xf86-input-wacom: Update to 0.36.0 Marius Bakke
2018-03-11 22:26 ` Ludovic Courtès
2018-05-07 9:54 ` Ludovic Courtès
2018-05-07 14:21 ` bug#30761: " Marius Bakke
2018-03-09 18:16 ` [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable Marius Bakke
2018-03-11 22:17 ` Ludovic Courtès
2018-03-12 12:47 ` Marius Bakke
2018-03-12 13:08 ` Marius Bakke
2018-03-12 14:01 ` Ludovic Courtès
2018-03-12 14:00 ` Ludovic Courtès
2018-03-12 14:44 ` Marius Bakke
2018-03-12 16:16 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180309181108.22888-7-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=30761@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).