diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 66b84ddff6..371529f819 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -412,19 +412,6 @@ 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"; diff --git a/distros/foxy/overrides.nix b/distros/foxy/overrides.nix index ca68d89c9c..a2af78486f 100644 --- a/distros/foxy/overrides.nix +++ b/distros/foxy/overrides.nix @@ -44,6 +44,19 @@ rosSelf: rosSuper: with rosSelf.lib; { sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; }; + # 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" ]; + }) ]; + }); + yaml-cpp-vendor = rosSuper.yaml-cpp-vendor.overrideAttrs ({ patches ? [], ... }: {