From 638cbba3fd2b9af096ca6a5bc2db44668e47116a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 30 Mar 2022 20:10:49 -0400
Subject: [PATCH] rviz2: finish fixing Assimp 5.1 compatibility

Fixes #173

Another patch was needed to make rviz work correctly with Assimp 5.1.
---
 distros/distro-overlay.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 1f0c9c52a9..e42585ac22 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -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";