diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-13 23:54:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-13 23:54:47 +0100 |
commit | 40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f (patch) | |
tree | d88bc366d7cd4438eb3530ca5792a4269f33fee0 | |
parent | 29f59a1e2035a0ce459cf63e8f841cbba916114b (diff) | |
parent | 27aed1b6426d204d4db32222b9e846945654c340 (diff) | |
download | nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar.gz nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar.bz2 nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar.lz nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar.xz nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.tar.zst nixpkgs-40991fa87c943ba096ebe7c2bb2dc47d7fbeda2f.zip |
Merge pull request #51304 from jtojnar/libinput-docs-fix
libinput: fix docs & libinput command
-rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1a903978fb8..09fa16fcf1d 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -2,15 +2,26 @@ , libevdev, mtdev, udev, libwacom , 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, python3Packages ? null +, testsSupport ? false, check ? null, valgrind ? null, python3 ? null }: -assert documentationSupport -> doxygen != null && graphviz != null; +assert documentationSupport -> doxygen != null && graphviz != null && python3 != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null && python3Packages != null; +assert testsSupport -> check != null && valgrind != null && python3 != null; let mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; + + sphinx-build = if documentationSupport then + python3.pkgs.sphinx.overrideAttrs (super: { + propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); + + postFixup = super.postFixup or "" + '' + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + }) + else null; in with stdenv.lib; @@ -32,18 +43,25 @@ stdenv.mkDerivation rec { "--libexecdir=${placeholder "bin"}/libexec" ]; - nativeBuildInputs = [ pkgconfig meson ninja python3Packages.python ] - ++ optionals documentationSupport [ doxygen graphviz ] - ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; + nativeBuildInputs = [ pkgconfig meson ninja ] + ++ optionals documentationSupport [ doxygen graphviz sphinx-build ] + ++ optionals testsSupport [ valgrind ]; - buildInputs = [ libevdev mtdev libwacom ] - ++ optionals eventGUISupport [ cairo glib gtk3 ]; + buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ] + ++ optionals eventGUISupport [ cairo glib gtk3 ] + ++ optionals testsSupport [ check ]; propagatedBuildInputs = [ udev ]; patches = [ ./udev-absolute-path.patch ]; - doCheck = testsSupport; + postPatch = '' + patchShebangs tools/helper-copy-and-exec-from-tmp.sh + patchShebangs test/symbols-leak-test + patchShebangs test/check-leftover-udev-rules.sh + ''; + + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; |