From 39dd3d18bc2819b332d480aa1dd8d1084d0a635a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 3 Aug 2023 22:12:05 -0700 Subject: [PATCH] python3.pkgs.meson-python: depend on top-level ninja This is a build tool that depends on a ninja binary directly, not through the ninja PyPI package. --- pkgs/development/python-modules/meson-python/default.nix | 7 ------- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 866512a4cfdd..4b45ee4e77d3 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -43,13 +43,6 @@ buildPythonPackage rec { ./add-build-flags.sh ]; - # Ugly work-around. Drop ninja dependency. - # We already have ninja, but it comes without METADATA. - # Building ninja-python-distributions is the way to go. - postPatch = '' - substituteInPlace pyproject.toml --replace "'ninja'," "" - ''; - meta = { changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst"; description = "Meson Python build backend (PEP 517)"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7424e43e9c80..9d7df6be84d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6442,7 +6442,9 @@ self: super: with self; { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - meson-python = callPackage ../development/python-modules/meson-python { }; + meson-python = callPackage ../development/python-modules/meson-python { + inherit (pkgs) ninja; + }; messagebird = callPackage ../development/python-modules/messagebird { };