libinput: fix subcommands

Running subcommands like `libinput measure` requires python and some python modules.

I previously added the dependencies in [1] but [2] accidentally moved them to checkInputs so they are not available at runtime by patchShebangs (especially since tests are disabled).

Additionally, the tools were ported from evdev python module to python-libevdev in libinput 1.14, which was missed [3] during upgrade.

Finally, other python modules are needed so let's add them as well.

[1]: https://github.com/NixOS/nixpkgs/pull/51304
[2]: de14f0c6e1
[3]: b291f2a995
This commit is contained in:
Jan Tojnar 2020-07-08 15:06:33 +02:00
parent 7c75c1ed56
commit 6cf8110264
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -47,10 +47,23 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz sphinx-build ];
buildInputs = [ libevdev mtdev libwacom ]
buildInputs = [
libevdev
mtdev
libwacom
(python3.withPackages (pp: with pp; [
pp.libevdev # already in scope
pyudev
pyyaml
setuptools
]))
]
++ optionals eventGUISupport [ cairo glib gtk3 ];
checkInputs = [ (python3.withPackages (pkgs: with pkgs; [ evdev ])) check valgrind ];
checkInputs = [
check
valgrind
];
propagatedBuildInputs = [ udev ];
@ -60,6 +73,7 @@ stdenv.mkDerivation rec {
patchShebangs tools/helper-copy-and-exec-from-tmp.sh
patchShebangs test/symbols-leak-test
patchShebangs test/check-leftover-udev-rules.sh
patchShebangs test/helper-copy-and-exec-from-tmp.sh
'';
doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform;