diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-07-16 04:58:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 04:58:38 +0200 |
| commit | d49b38b73ccbc8d911d1338c4adaef784a86134a (patch) | |
| tree | a6a99334259b838db92461b7e30a3808db731963 /pkgs/development/libraries/libinput | |
| parent | 166a71a6ae4225bcb2e36033f463a67600df837e (diff) | |
| parent | f83c9a7561696422a00776065033af35477dba58 (diff) | |
| download | nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar.gz nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar.bz2 nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar.lz nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar.xz nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.tar.zst nixpkgs-d49b38b73ccbc8d911d1338c4adaef784a86134a.zip | |
Merge pull request #92715 from jtojnar/fix-libinput-commands
Diffstat (limited to 'pkgs/development/libraries/libinput')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 516fbeb7c3a..cb8009011b6 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/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; |