aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-09 18:34:10 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-12 17:27:07 +0100
commit285c091e80782bf46a0b4d75f41f1eb26105124a (patch)
treea4d1b73851cf02e05b1455f7d71df7ab49021c0d /gnu/packages
parentd5b5a15a4046362377f1a45d466b43bb6e93d4f8 (diff)
downloadguix-285c091e80782bf46a0b4d75f41f1eb26105124a.tar
guix-285c091e80782bf46a0b4d75f41f1eb26105124a.tar.gz
gnu: libinput: Update to 1.10.2.
* gnu/packages/freedesktop.scm (libinput): Update to 1.10.2. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Add #:configure-flags to not build documentation. [native-inputs]: Add CHECK and VALGRIND. Move CAIRO and GTK+ ... [inputs]: ... here. Move LIBEVDEV, LIBWACOM and MTDEV ... [propagated-inputs]: ... here. (libinput-minimal)[native-inputs]: Inherit from LIBINPUT. [inputs]: New field; set to empty list. [arguments]: Inherit from LIBINPUT. Adjust to build system change.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/freedesktop.scm50
1 files changed, 30 insertions, 20 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3c83e668b0..a323778cab 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -30,10 +30,12 @@
(define-module (gnu packages freedesktop)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (gnu packages acl)
@@ -68,11 +70,13 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages python)
+ #:use-module (gnu packages valgrind)
#:use-module (gnu packages w3m)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (srfi srfi-1))
(define-public xdg-utils
(package
@@ -142,26 +146,31 @@ freedesktop.org project.")
(define-public libinput
(package
(name "libinput")
- (version "1.7.3")
+ (version "1.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz"))
(sha256
(base32
- "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"))))
- (build-system gnu-build-system)
+ "1fbv354ii1g4wc4k7d7gbnalqjpzmk9zlpi8linqrzlf6inpc28m"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:configure-flags '("-Ddocumentation=false")))
(native-inputs
- `(("cairo" ,cairo)
- ("gtk+" ,gtk+)
- ("pkg-config" ,pkg-config)))
+ `(("check" ,check)
+ ("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
@@ -172,14 +181,15 @@ other applications that need to directly deal with input devices.")
(define-public libinput-minimal
(package (inherit libinput)
(name "libinput-minimal")
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (inputs
- `(("libevdev" ,libevdev)
- ("mtdev" ,mtdev)))
+ (inputs '())
+ (propagated-inputs
+ (alist-delete "libwacom" (package-propagated-inputs libinput)))
(arguments
- `(#:configure-flags
- '("--disable-libwacom")))))
+ (substitute-keyword-arguments (package-arguments libinput)
+ ((#:configure-flags flags ''())
+ `(cons* "-Dlibwacom=false"
+ "-Ddebug-gui=false" ;requires gtk+@3
+ ,flags))))))
(define-public libxdg-basedir
(package