From a5af84ef2c584e3c86b36a6044c172c6ce46191d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Sep 2018 23:58:48 +0200 Subject: [PATCH] libinput: add python3 for install script Meson no longer propagates it so we need to re-add it. --- pkgs/development/libraries/libinput/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 87c6bb03d4b..8297d7c4dda 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -29,13 +29,10 @@ stdenv.mkDerivation rec { (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") + "--libexecdir=${placeholder "bin"}/libexec" ]; - preConfigure = '' - mesonFlags="$mesonFlags --libexecdir=$bin/libexec" - ''; - - nativeBuildInputs = [ pkgconfig meson ninja ] + nativeBuildInputs = [ pkgconfig meson ninja python3Packages.python ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];