ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #197760 from jtojnar/no-meson-expose

Browse Source 
Revert "meson: expose python3 in passthru"
This commit is contained in:
Anderson Torres 2022-10-26 18:16:14 -03:00 committed by GitHub
commit c85a3fc453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/analysis/rizin/default.nix
View File

@ -14,6 +14,7 @@
, lz4 , lz4
, xxHash , xxHash
, meson , meson
, python3
, cmake , cmake
, ninja , ninja
, capstone , capstone
@ -43,7 +44,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
meson meson
meson.python3.pkgs.pyyaml (python3.withPackages (pp: with pp; [
pyyaml
]))
ninja ninja
cmake cmake
]; ];
@ -79,6 +82,14 @@ stdenv.mkDerivation rec {
xxHash 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 = { meta = {
description = "UNIX-like reverse engineering framework and command-line toolset."; description = "UNIX-like reverse engineering framework and command-line toolset.";
homepage = "https://rizin.re/"; homepage = "https://rizin.re/";

4
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -103,10 +103,6 @@ python3.pkgs.buildPythonApplication rec {
installShellCompletion --bash data/shell-completions/bash/meson installShellCompletion --bash data/shell-completions/bash/meson
''; '';
passthru = {
inherit python3;
};
meta = with lib; { meta = with lib; {
homepage = "https://mesonbuild.com"; homepage = "https://mesonbuild.com";
description = "An open source, fast and friendly build system made in Python"; description = "An open source, fast and friendly build system made in Python";