movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-12 02:34:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rosidl-generator-py patching.

Browse source 
The patch is no longer needed on rolling.
This commit is contained in:
Ben Wolsieffer 2024-07-24 18:56:01 -04:00
parent 80b46d5263
commit 252ad9fcb2
4 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
distros/humble/overrides.nix
View file

@ -117,6 +117,19 @@ in with lib; {
nativeBuildInputs = nativeBuildInputs ++ [ rosSelf.ros-environment ]; nativeBuildInputs = nativeBuildInputs ++ [ rosSelf.ros-environment ];
}); });
rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
postPatch ? "", ...
}: let
python = rosSelf.python;
in {
# Fix finding NumPy headers
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'"
'';
});
rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor { rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip"; url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";

13
distros/iron/overrides.nix
View file

@ -63,6 +63,19 @@ in with lib; {
fetchgitArgs.hash = "sha256-f7GZgOzUrkAfw1mqwlIKQQqDvkvIahGlHvq6AL+aAvA="; fetchgitArgs.hash = "sha256-f7GZgOzUrkAfw1mqwlIKQQqDvkvIahGlHvq6AL+aAvA=";
}; };
rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
postPatch ? "", ...
}: let
python = rosSelf.python;
in {
# Fix finding NumPy headers
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'"
'';
});
rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({ rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
postPatch ? "", ... postPatch ? "", ...
}: let }: let

13
distros/jazzy/overrides.nix
View file

@ -62,6 +62,19 @@ in {
hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE="; hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE=";
}; };
rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
postPatch ? "", ...
}: let
python = rosSelf.python;
in {
# Fix finding NumPy headers
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'"
'';
});
rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor { rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre.git"; url = "https://github.com/OGRECave/ogre.git";
rev = "v1.12.10"; rev = "v1.12.10";

12
distros/ros2-overlay.nix
View file

@ -126,17 +126,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
buildInputs; buildInputs;
}); });
rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({ rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({ ... }: {
postPatch ? "", ...
}: let
python = rosSelf.python;
in {
# Fix finding NumPy headers
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'"
'';
setupHook = ./rosidl-generator-py-setup-hook.sh; setupHook = ./rosidl-generator-py-setup-hook.sh;
}); });