diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index 5f14a4017c52..dad7193dd25d 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -14,6 +14,7 @@ , lz4 , xxHash , meson +, python3 , cmake , ninja , capstone @@ -43,7 +44,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson - meson.python3.pkgs.pyyaml + (python3.withPackages (pp: with pp; [ + pyyaml + ])) ninja cmake ]; @@ -79,6 +82,14 @@ stdenv.mkDerivation rec { xxHash ]; + postPatch = '' + # find_installation without arguments uses Meson’s Python interpreter, + # which does not have any extra modules. + # https://github.com/mesonbuild/meson/pull/9904 + substituteInPlace meson.build \ + --replace "import('python').find_installation()" "find_program('python3')" + ''; + meta = { description = "UNIX-like reverse engineering framework and command-line toolset."; homepage = "https://rizin.re/"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 5107438fe91d..866fa303148a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -103,10 +103,6 @@ python3.pkgs.buildPythonApplication rec { installShellCompletion --bash data/shell-completions/bash/meson ''; - passthru = { - inherit python3; - }; - meta = with lib; { homepage = "https://mesonbuild.com"; description = "An open source, fast and friendly build system made in Python";