Merge pull request #46020 from jtojnar/meson-0.47

meson: 0.46.1 → 0.48.2
2018-11-18 22:17:49 +01:00
parent ec754cd657 927a82d60f
commit 85bd2a7acb
10 changed files with 56 additions and 31 deletions
--- 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 ];