diff --git a/distros/foxy/overrides.nix b/distros/foxy/overrides.nix index 67306a2831..0bdfbce0f0 100644 --- a/distros/foxy/overrides.nix +++ b/distros/foxy/overrides.nix @@ -92,7 +92,16 @@ rosSelf: rosSuper: with rosSelf.lib; { rviz-ogre-vendor = (patchVendorUrl rosSuper.rviz-ogre-vendor { url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip"; sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; - }).overrideAttrs ({ preFixup ? "", ... }: { + }).overrideAttrs ({ patches ? [], preFixup ? "", ... }: { + patches = patches ++ [ + # Fix AArch64 builds. + (self.fetchpatch { + url = "https://github.com/ros2/rviz/pull/828.patch"; + hash = "sha256-KpY9+oOsFxH+zhIxyP6UTOXTLaaUdCRzUMZnM7+uRAk="; + stripLen = 1; + }) + ]; + preFixup = '' # Prevent /build RPATH references rm -r ogre_install