Skip to content

Commit

Permalink
fix: ros2 build on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
stevalkr committed Jan 16, 2025
1 parent 503be40 commit 8e6538d
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions distros/ros2-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,25 @@ rosSelf: rosSuper: with rosSelf.lib; {
};
});

rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
nativeBuildInputs ? [], ...
}: {
nativeBuildInputs = nativeBuildInputs ++ optionals self.stdenv.isDarwin [
self.darwin.apple_sdk.frameworks.Foundation
self.darwin.apple_sdk.frameworks.AppKit
];
});

tracetools = rosSuper.tracetools.overrideAttrs ({
propagatedBuildInputs ? [], ...
}: {
# lttng-ust and lttng-tools is not available on Darwin
propagatedBuildInputs = if self.stdenv.isDarwin then
[]
else
propagatedBuildInputs;
});

# The build gets stuck in an infinite loop with absolute CMAKE_INSTALL_LIBDIR:
# https://github.com/lagadic/visp/blob/9f1997ad17688c2d104cf2b29b57382c5d0af960/cmake/VISPGenerateConfig.cmake#L46
# Also has the standard bad assumptions that CMAKE_INSTALL_*DIR is relative.
Expand Down

0 comments on commit 8e6538d

Please sign in to comment.