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

cartographer-ros: Fix compile errors

Browse source
This commit is contained in:
Michal Sojka 2025-04-18 09:47:35 +02:00 • committed by Ben Wolsieffer
parent 50b5a8d253
commit 68da1c3d13
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
distros/ros2-overlay.nix
View file

@ -69,6 +69,26 @@ rosSelf: rosSuper: with rosSelf.lib; {
'';
});
cartographer-ros = rosSuper.cartographer-ros.overrideAttrs ({
patches ? [],
postPatch ? "", ...
}: {
patches = patches ++ [
# Fix compilation with glog >= 0.7.0 (https://github.com/ros2/cartographer_ros/pull/76)
(self.fetchpatch {
url = "https://github.com/ros2/cartographer_ros/commit/58cd253615606efbf0bf69d16a932d35aadef1f7.patch";
hash = "sha256-rmolyUYIWPT37kYITDW4cRO0XJNdIYs6AoUWgWVb8PU=";
stripLen = 1;
})
];
# Add ABSL_ prefix to thread annotation macros. See details above.
postPatch = ''
sed -i -Ee 's/\<(LOCKS_EXCLUDED|EXCLUSIVE_LOCKS_REQUIRED|GUARDED_BY)\>/ABSL_\1/g' \
$(find -name \*.h -o -name \*.cpp )
'';
});
cyclonedds = rosSuper.cyclonedds.overrideAttrs ({
cmakeFlags ? [], ...
}: {