diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-08 15:06:33 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-08-15 18:21:31 +0000 |
commit | bc7e76d157811712a394163f55e1220059620d25 (patch) | |
tree | 126d72f8325ff81fab1997d40541cb13313cf7de /nixpkgs | |
parent | 554dd6d641c72130678f097ffd18bd32a4d7740c (diff) | |
download | nixlib-bc7e76d157811712a394163f55e1220059620d25.tar nixlib-bc7e76d157811712a394163f55e1220059620d25.tar.gz nixlib-bc7e76d157811712a394163f55e1220059620d25.tar.bz2 nixlib-bc7e76d157811712a394163f55e1220059620d25.tar.lz nixlib-bc7e76d157811712a394163f55e1220059620d25.tar.xz nixlib-bc7e76d157811712a394163f55e1220059620d25.tar.zst nixlib-bc7e76d157811712a394163f55e1220059620d25.zip |
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]: https://github.com/NixOS/nixpkgs/commit/de14f0c6e1247aa48b0d77c4a3390a61e020bebf [3]: https://github.com/NixOS/nixpkgs/commit/b291f2a9953d48d6edc5c73776db9ba289ccf213 (cherry picked from commit 6cf81102647a1fcfb5f704c82de1b45deffbb9a2)
Diffstat (limited to 'nixpkgs')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libinput/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index f490dfbd23a2..148d334b946a 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -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; |