movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 14:10:37 +03:00
Code Activity

melodic: geometric-shapes: add patch to fix build

Browse source
This commit is contained in:
Ben Wolsieffer 2021-05-30 13:37:44 -04:00
parent c42f077a7c
commit ec0757eb80
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
distros/melodic/overrides.nix
View file

@ -16,6 +16,24 @@ rosSelf: rosSuper: with rosSelf.lib; {
gazebo = self.gazebo_9;
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
# Revert formatting changes that cause conflict with next patch
(self.fetchpatch {
url = "https://github.com/ros-planning/geometric_shapes/commit/12afa837202dcc6c96f96fc499ef25078f997b75.patch";
sha256 = "069yj33jj74i6ka98y4m8pwn64dl9bgmiapkmlwvyk5as2w9ndvx";
revert = true;
})
# Fix build with latest QHull
(self.fetchpatch {
url = "https://github.com/ros-planning/geometric_shapes/commit/22e5a02a06c36bfc0c49ce5cc636e7ab64d8b0be.patch";
sha256 = "015min5qdi8vkvbjbcvyrf41ycd2nk2d371x1jb0xpn30r8nhlin";
})
];
});
pcl-ros = rosSuper.pcl-ros.overrideAttrs ({
patches ? [], ...
}: {