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

Only apply octomap patching on rolling and jazzy

Browse source 
Older distros don't need it
This commit is contained in:
Ben Wolsieffer 2024-11-15 14:19:01 -05:00
parent 123b5ce6a2
commit 0486d60a0d
3 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
distros/jazzy/overrides.nix
View file

@ -195,6 +195,28 @@ in {
hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE=";
};
moveit-core = rosSuper.moveit-core.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre.git";
rev = "v1.12.10";

22
distros/rolling/overrides.nix
View file

@ -195,6 +195,28 @@ in {
hash = "sha256-ZP8+URGfN//Pr53uy9mHp8tNTZA110o/03czlaRw/aE=";
};
moveit-core = rosSuper.moveit-core.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
nlohmann-json-schema-validator-vendor = lib.patchExternalProjectGit rosSuper.nlohmann-json-schema-validator-vendor {
url = "https://github.com/pboettch/json-schema-validator.git";
rev = "5ef4f903af055550e06955973a193e17efded896";

22
distros/ros2-overlay.nix
View file

@ -112,28 +112,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
'';
});
moveit-core = rosSuper.moveit-core.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
popf = rosSuper.popf.overrideAttrs ({
nativeBuildInputs ? [], postPatch ? "", ...
}: {