JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libinput: 1.7.3 -> 1.8.3

Browse Source 
fixes #29784
This commit is contained in:
Yegor Timoshenko 2017-09-25 20:01:05 +00:00 committed by Jörg Thalheim
parent db11d7fd2b
commit 12f460e9e6
2 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/libraries/libinput/default.nix
View File

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

21
pkgs/development/libraries/libinput/udev-absolute-path.patch
View File

@ -1,12 +1,11 @@
--- configure.ac 2016-05-27 14:00:25.248388226 +0200 --- a/meson.build 2017-09-25 11:37:07.787726521 +0000
+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 +++ b/meson.build 2017-09-25 11:38:48.958233247 +0000
@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil @@ -100,7 +100,7 @@
# Used by the udev rules so we can use callouts during testing without args : model_quirks)
# installing everything first. Default is the empty string so the installed
# rule will use udev's default path. Override is in udev/Makefile.am
-AC_SUBST(UDEV_TEST_PATH, "")
+UDEV_TEST_PATH="${UDEV_DIR}/"
+AC_SUBST(UDEV_TEST_PATH)
AC_PATH_PROG(SED, [sed])
AC_CONFIG_FILES([Makefile udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '')
+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules',
install : true,