diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-18 12:34:10 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-11-05 20:44:10 +0100 |
commit | c01fd4a3e359ad07e58b29fbbd1067d29842b19e (patch) | |
tree | 87e515c36997086970ebe8e1336cf16e100d72d3 /pkgs/development/libraries/libinput | |
parent | fd115ece2952afaf39505ae8ded6ac4eb1db5196 (diff) | |
download | nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar.gz nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar.bz2 nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar.lz nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar.xz nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.tar.zst nixlib-c01fd4a3e359ad07e58b29fbbd1067d29842b19e.zip |
libinput: 1.7.3 → 1.9.1
Diffstat (limited to 'pkgs/development/libraries/libinput')
-rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libinput/udev-absolute-path.patch | 21 |
2 files changed, 20 insertions, 23 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b30480..553bb9463ede 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, meson, ninja , 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 -, autoconf, automake }: assert documentationSupport -> doxygen != null && graphviz != null; @@ -11,38 +10,37 @@ assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; + mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.9.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ libevdev mtdev libwacom autoconf automake ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] + nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; + 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"; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b299..fb22fea40e80 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # 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]) +--- a/meson.build ++++ b/meson.build +@@ -100,7 +100,7 @@ + args : model_quirks) - 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, |