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/os-specific | |
| parent | ec754cd6574748e97ffe5d6e0726cb7fc058eb80 (diff) | |
| parent | 927a82d60f876d34efc179d049a8c2a44b6c0c5d (diff) | |
| download | nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.gz nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.bz2 nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.lz nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.xz nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.tar.zst nixlib-85bd2a7acb10eca811d23b0c4ee440f8cdc503ec.zip | |
Merge pull request #46020 from jtojnar/meson-0.47
meson: 0.46.1 → 0.48.2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/libratbag/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 271dc156695a..c614b39255d6 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -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/" |