BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libinput: fix docs & libinput command

Browse source 
libinput switched from Doxygen to Sphinx for user docs. Since Sphinx is a Python
module, it propagates Python. And because it is listed in nativeBuildInputs,
its python binary takes precedence over the one added in buildInputs.
This results in a wrong interpreter being substituted into shebangs.

The contamination occurred previously too but libinput does not use pyparsing
dependency since 1.12.0, so it could be removed.

I prevented Sphinx from propagating Python and added some additional
dependencies to it. In the future we might want something more reusable.

While at it, I also fixed the tests.
This commit is contained in:
Jan Tojnar 2018-12-01 02:08:04 +01:00
parent 84162175a3
commit 27aed1b642
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/development/libraries/libinput/default.nix
View file

@ -2,15 +2,26 @@
, libevdev, mtdev, udev, libwacom , libevdev, mtdev, udev, libwacom
, 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, 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 eventGUISupport -> cairo != null && glib != null && gtk3 != null;
assert testsSupport -> check != null && valgrind != null && python3Packages != null; assert testsSupport -> check != null && valgrind != null && python3 != null;
let let
mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; 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 in
with stdenv.lib; with stdenv.lib;
@ -32,18 +43,25 @@ stdenv.mkDerivation rec {
"--libexecdir=${placeholder "bin"}/libexec" "--libexecdir=${placeholder "bin"}/libexec"
]; ];
nativeBuildInputs = [ pkgconfig meson ninja python3Packages.python ] nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz ] ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; ++ optionals testsSupport [ valgrind ];
buildInputs = [ libevdev mtdev libwacom ] buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ]
++ optionals eventGUISupport [ cairo glib gtk3 ]; ++ optionals eventGUISupport [ cairo glib gtk3 ]
++ optionals testsSupport [ check ];
propagatedBuildInputs = [ udev ]; propagatedBuildInputs = [ udev ];
patches = [ ./udev-absolute-path.patch ]; 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 = { 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";