From e90ab768ce10bca72215de95edaf71cdb5b645ae Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 27 May 2016 14:17:11 +0200 Subject: [PATCH] libinput: Use absolute paths in udev rules. Closes #17054 --- pkgs/development/libraries/libinput/default.nix | 6 +++++- .../libraries/libinput/udev-absolute-path.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libinput/udev-absolute-path.patch diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a8dc8f357a7..0efee5b94f7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -3,6 +3,7 @@ , 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; @@ -32,13 +33,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ 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; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch new file mode 100644 index 00000000000..2d3fa966b29 --- /dev/null +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -0,0 +1,12 @@ +--- 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]) + + AC_CONFIG_FILES([Makefile