From b5c2a1ac5286c83e520790ae5162d9361e99a971 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 31 Jan 2025 20:11:47 +0100 Subject: [PATCH] humble.rosidl-generator-py: Fix numpy include path In the past NumPy core headers were under numpy/core/include, but in recent nixpkgs versions, the location changed to numpy/_core/include. NumPy >= 2.0 also includes numpy-config tool. We could use the tool to get the correct path, instead of hardcoding it in the Nix expression, but I'm not sure how it would work with cross-compiling, so I'm leaving the logic as it was. --- distros/humble/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index 7502b27759..6693f03f7e 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -139,7 +139,7 @@ in with lib; { postPatch = postPatch + '' substituteInPlace cmake/rosidl_generator_py_generate_interfaces.cmake \ --replace-fail '"import numpy"' "" \ - --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/core/include'" + --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/_core/include'" ''; });