diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-18 22:17:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 22:17:49 +0100 |
| commit | 85bd2a7acb10eca811d23b0c4ee440f8cdc503ec (patch) | |
| tree | 72a371961c60e3dac80b4aacc343ee69ac7b7dd8 /pkgs/development/libraries/libinput | |
| parent | ec754cd6574748e97ffe5d6e0726cb7fc058eb80 (diff) | |
| parent | 927a82d60f876d34efc179d049a8c2a44b6c0c5d (diff) | |
| download | nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.gz nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.bz2 nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.lz nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.xz nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.zst nixpkgs-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.zip | |
Merge pull request #46020 from jtojnar/meson-0.47
meson: 0.46.1 → 0.48.2
Diffstat (limited to 'pkgs/development/libraries/libinput')
| -rw-r--r-- | pkgs/development/libraries/libinput/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index b5b0c98427f..1a903978fb8 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 ]; |