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

libinput: Use absolute paths in udev rules. 

Closes #17054
This commit is contained in:
Marcus Brinkmann 2016-05-27 14:17:11 +02:00 committed by Nikolay Amiantov
parent 4cf02e648d
commit e90ab768ce
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
, 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;
@ -32,13 +33,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libevdev mtdev libwacom ] buildInputs = [ libevdev mtdev libwacom autoconf automake ]
++ 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;

12
pkgs/development/libraries/libinput/udev-absolute-path.patch Normal file
View File

@ -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