From 259a468bb344c9c02c81453371f613efbc487c22 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 27 Dec 2024 03:09:29 +0000 Subject: [PATCH] python3Packages.meson-python: honor mesonFlagsArray --- .../python-modules/meson-python/add-build-flags.sh | 2 +- pkgs/development/python-modules/numpy/1.nix | 5 ----- pkgs/development/python-modules/numpy/2.nix | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index e1b2588f07fc..dd31fc453656 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,6 +1,6 @@ mesonPythonBuildFlagsHook() { # Add all of mesonFlags to -Csetup-args for pypa builds - for f in $mesonFlags; do + for f in $mesonFlags "${mesonFlagsArray[@]}"; do appendToVar pypaBuildFlags "-Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html appendToVar pipBuildFlags "--config-settings=setup-args=$f" diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index fad35559c9ed..5d7216286564 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -124,11 +124,6 @@ buildPythonPackage rec { export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; - # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python - postConfigure = '' - concatTo mesonFlags mesonFlagsArray - ''; - preBuild = '' ln -s ${cfg} site.cfg ''; diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index eb672a053f25..90f1fc68e3c0 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -101,11 +101,6 @@ buildPythonPackage rec { export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; - # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python - postConfigure = '' - concatTo mesonFlags mesonFlagsArray - ''; - buildInputs = [ blas lapack