Revert "libinput: 1.7.3 -> 1.8.3"

This reverts commit 12f460e9e6.
It doesn't build.  Discuss at #29784.
This commit is contained in:
Vladimír Čunát
2017-10-16 11:55:40 +02:00
parent e55b99e840
commit 88b853eb80
2 changed files with 32 additions and 22 deletions

View File

@@ -1,40 +1,49 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom
{ stdenv, fetchurl, pkgconfig
, libevdev, mtdev, udev, libwacom
, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
, testsSupport ? false, check ? null, valgrind ? null }:
, testsSupport ? false, check ? null, valgrind ? null
, autoconf, automake
}:
assert documentationSupport -> doxygen != null && graphviz != null;
assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
assert testsSupport -> check != null && valgrind != null;
let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false";
in with stdenv.lib; stdenv.mkDerivation rec {
let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
version = "1.8.3";
version = "1.7.3";
src = fetchurl {
url = "https://freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig";
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
};
outputs = [ "out" "dev" ];
mesonFlags = [
configureFlags = [
(mkFlag documentationSupport "documentation")
(mkFlag eventGUISupport "debug-gui")
(mkFlag eventGUISupport "event-gui")
(mkFlag testsSupport "tests")
];
patches = [ ./udev-absolute-path.patch ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [ libevdev mtdev libwacom ]
buildInputs = [ libevdev mtdev libwacom autoconf automake ]
++ optionals eventGUISupport [ cairo glib gtk3 ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind ];
propagatedBuildInputs = [ udev ];
patches = [ ./udev-absolute-path.patch ];
patchFlags = [ "-p0" ];
meta = {
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
homepage = http://www.freedesktop.org/wiki/Software/libinput;