diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index f3638e3ef6..69a5ac0695 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -15,6 +15,19 @@ rosSelf: rosSuper: with rosSelf.lib; { ]; }); + cyclonedds = rosSuper.cyclonedds.overrideAttrs ({ + patches ? [], ... + }: { + patches = [ + # Fix paths in pkg-config file + # https://github.com/eclipse-cyclonedds/cyclonedds/pull/1453 + (self.fetchpatch { + url = "https://github.com/eclipse-cyclonedds/cyclonedds/commit/3ff967e32b8078d497a8b9c70735849c04eaebf6.patch"; + hash = "sha256-F5zofoO0YbYfqLrb6s30un9k9+R8rQazLHw+uND1UxE="; + }) + ]; + }); + gazebo = self.gazebo_11; iceoryx-hoofs = rosSuper.iceoryx-hoofs.overrideAttrs ({ diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix index fb8adc4dbc..f3c37a4f57 100644 --- a/distros/ros2-overlay.nix +++ b/distros/ros2-overlay.nix @@ -13,18 +13,8 @@ rosSelf: rosSuper: with rosSelf.lib; { }); cyclonedds = rosSuper.cyclonedds.overrideAttrs ({ - patches ? [], cmakeFlags ? [], ... }: { - patches = [ - # Fix paths in pkg-config file - # https://github.com/eclipse-cyclonedds/cyclonedds/pull/1453 - (self.fetchpatch { - url = "https://github.com/eclipse-cyclonedds/cyclonedds/commit/3ff967e32b8078d497a8b9c70735849c04eaebf6.patch"; - hash = "sha256-F5zofoO0YbYfqLrb6s30un9k9+R8rQazLHw+uND1UxE="; - }) - ]; - cmakeFlags = cmakeFlags ++ [ # Tries to download something with maven "-DBUILD_IDLC=OFF"