Merge pull request #46020 from jtojnar/meson-0.47

meson: 0.46.1 → 0.48.2
This commit is contained in:
Jan Tojnar
2018-11-18 22:17:49 +01:00
committed by GitHub
10 changed files with 56 additions and 31 deletions

View File

@@ -12,15 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "0cr5skrb7a5mgj7dkm647ib8336hb88bf11blaf6xldafi8b0jlj";
};
# todo: python should be in buildInputs, but right now meson propagates
# its own python. see: https://github.com/NixOS/nixpkgs/pull/46020
nativeBuildInputs = [
(python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
meson ninja pkgconfig gitMinimal swig check valgrind
];
buildInputs = [ glib systemd udev libevdev ];
buildInputs = [
glib systemd udev libevdev
(python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
];
mesonFlags = [
"-Dsystemd-unit-dir=./lib/systemd/system/"