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

rviz2: finish fixing Assimp 5.1 compatibility

Browse source 
Fixes #173

Another patch was needed to make rviz work correctly with Assimp 5.1.
This commit is contained in:
Ben Wolsieffer 2022-03-30 20:10:49 -04:00
parent bcc3552eb5
commit 638cbba3fd
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
distros/distro-overlay.nix
View file

@ -402,14 +402,15 @@ let
});
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/817
# https://github.com/ros2/rviz/pull/827
rviz-assimp-vendor = rosSuper.rviz-assimp-vendor.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/dfbc93e23505f708a84ba7f5d8ebd1164f662804.patch";
stripLen = 1;
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-JW3GgSukrWR19je35crNeQNSDR6ZRoFRzpR/MBcwMws=";
stripLen = 1;
includes = [ "rviz_assimp_vendor-extras.cmake.in" ];
}) ];
});
@ -422,6 +423,19 @@ let
'' + preFixup;
});
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/827
rviz-rendering = rosSuper.rviz-rendering.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-1kYIrcdm7mu39OFXeDmMWGJygeTKr1fc6ECbM5hf3ZU=";
stripLen = 1;
includes = [ "CMakeLists.txt" ];
}) ];
});
rxcpp-vendor = patchVendorUrl rosSuper.rxcpp-vendor {
url = "https://github.com/ReactiveX/RxCpp/archive/v4.1.0.tar.gz";
sha256 = "1smxrcm0s6bz05185dx1i2xjgn47rq7m247pblil6p3bmk3lkfyk";