nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "gnu: libinput: Update to 1.9.3." 

This reverts commit 5f5083749c.

Ninja FTBFS on armhf-linux and thus cannot build libinput.
This commit is contained in:
Efraim Flashner 2017-12-11 11:40:52 +02:00
parent aa5c206348
commit 16a7a74561
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/freedesktop.scm
View File

@ -33,7 +33,6 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages acl) #:use-module (gnu packages acl)
@ -68,7 +67,6 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages w3m) #:use-module (gnu packages w3m)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -143,22 +141,19 @@ freedesktop.org project.")
(define-public libinput (define-public libinput
(package (package
(name "libinput") (name "libinput")
(version "1.9.3") (version "1.7.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/" (uri (string-append "https://freedesktop.org/software/libinput/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"09wkc5qqk1k2a68cwfy4x853z8z35wf2qkijh66kacsvc2fjq394")))) "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"))))
(build-system meson-build-system) (build-system gnu-build-system)
(arguments '(#:configure-flags '("-Ddocumentation=false")))
(native-inputs (native-inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("check" ,check)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)))
("valgrind" ,valgrind)))
(propagated-inputs (propagated-inputs
`(("libudev" ,eudev))) ; required by libinput.pc `(("libudev" ,eudev))) ; required by libinput.pc
(inputs (inputs
@ -177,17 +172,13 @@ other applications that need to directly deal with input devices.")
(package (inherit libinput) (package (inherit libinput)
(name "libinput-minimal") (name "libinput-minimal")
(native-inputs (native-inputs
`(("check" ,check) `(("pkg-config" ,pkg-config)))
("pkg-config" ,pkg-config)
("valgrind" ,valgrind)))
(inputs (inputs
`(("libevdev" ,libevdev) `(("libevdev" ,libevdev)
("mtdev" ,mtdev))) ("mtdev" ,mtdev)))
(arguments (arguments
'(#:configure-flags `(#:configure-flags
'("-Dlibwacom=false" '("--disable-libwacom")))))
"-Ddocumentation=false"
"-Ddebug-gui=false"))))) ; requires gtk+@3
(define-public libxdg-basedir (define-public libxdg-basedir
(package (package