pyrox.dev
libinput: 1.7.3 -> 1.8.3
fixes #29784
authored by
Yegor Timoshenko
and committed by
Jörg Thalheim
12f460e9
db11d7fd
+12
-21
pkgs/development/libraries/libinput/default.nix
+12
-21
pkgs/development/libraries/libinput/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig
2
-
, libevdev, mtdev, udev, libwacom
1
+
{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom
3
2
, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
4
3
, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
5
-
, testsSupport ? false, check ? null, valgrind ? null
6
-
, autoconf, automake
7
-
}:
4
+
, testsSupport ? false, check ? null, valgrind ? null }:
8
5
9
6
assert documentationSupport -> doxygen != null && graphviz != null;
10
7
assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
11
8
assert testsSupport -> check != null && valgrind != null;
12
9
13
-
let
14
-
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
15
-
in
16
-
17
-
with stdenv.lib;
18
-
stdenv.mkDerivation rec {
10
+
let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false";
11
+
in with stdenv.lib; stdenv.mkDerivation rec {
19
12
name = "libinput-${version}";
20
-
version = "1.7.3";
13
+
version = "1.8.3";
21
14
22
15
src = fetchurl {
23
-
url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
24
-
sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
16
+
url = "https://freedesktop.org/software/libinput/${name}.tar.xz";
17
+
sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig";
25
18
};
26
19
27
20
outputs = [ "out" "dev" ];
28
21
29
-
configureFlags = [
22
+
mesonFlags = [
30
23
(mkFlag documentationSupport "documentation")
31
-
(mkFlag eventGUISupport "event-gui")
24
+
(mkFlag eventGUISupport "debug-gui")
32
25
(mkFlag testsSupport "tests")
33
26
];
34
27
35
-
nativeBuildInputs = [ pkgconfig ];
28
+
patches = [ ./udev-absolute-path.patch ];
36
29
37
-
buildInputs = [ libevdev mtdev libwacom autoconf automake ]
30
+
nativeBuildInputs = [ meson ninja pkgconfig ];
31
+
buildInputs = [ libevdev mtdev libwacom ]
38
32
++ optionals eventGUISupport [ cairo glib gtk3 ]
39
33
++ optionals documentationSupport [ doxygen graphviz ]
40
34
++ optionals testsSupport [ check valgrind ];
41
35
42
36
propagatedBuildInputs = [ udev ];
43
-
44
-
patches = [ ./udev-absolute-path.patch ];
45
-
patchFlags = [ "-p0" ];
46
37
47
38
meta = {
48
39
description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
+10
-11
pkgs/development/libraries/libinput/udev-absolute-path.patch
+10
-11
pkgs/development/libraries/libinput/udev-absolute-path.patch
···
1
-
--- configure.ac 2016-05-27 14:00:25.248388226 +0200
2
-
+++ configure.ac 2016-05-27 14:01:28.228943416 +0200
3
-
@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil
4
-
# Used by the udev rules so we can use callouts during testing without
5
-
# installing everything first. Default is the empty string so the installed
6
-
# rule will use udev's default path. Override is in udev/Makefile.am
7
-
-AC_SUBST(UDEV_TEST_PATH, "")
8
-
+UDEV_TEST_PATH="${UDEV_DIR}/"
9
-
+AC_SUBST(UDEV_TEST_PATH)
10
-
AC_PATH_PROG(SED, [sed])
1
+
--- a/meson.build 2017-09-25 11:37:07.787726521 +0000
2
+
+++ b/meson.build 2017-09-25 11:38:48.958233247 +0000
3
+
@@ -100,7 +100,7 @@
4
+
args : model_quirks)
11
5
12
-
AC_CONFIG_FILES([Makefile
6
+
udev_rules_config = configuration_data()
7
+
-udev_rules_config.set('UDEV_TEST_PATH', '')
8
+
+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
9
+
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
10
+
output : '80-libinput-device-groups.rules',
11
+
install : true,