From 93cf5a5ba4d6efc9ecee7fa8b83cf914400b83b4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 21 Sep 2022 23:31:15 -0400 Subject: [PATCH] Foxy already has ament-cmake-export-targets patch. --- distros/distro-overlay.nix | 13 ------------- distros/galactic/overrides.nix | 13 +++++++++++++ distros/humble/overrides.nix | 13 +++++++++++++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 630d7db79d..7055123761 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -61,19 +61,6 @@ let nativeBuildInputs = [ setupHook ] ++ nativeBuildInputs; }); - ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({ - patches ? [], ... - }: { - patches = patches ++ [ - # Support new target export template introduced with CMake 3.24 - (self.fetchpatch { - url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch"; - stripLen = 1; - sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4="; - }) - ]; - }); - camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers; catkin = rosSuper.catkin.overrideAttrs ({ diff --git a/distros/galactic/overrides.nix b/distros/galactic/overrides.nix index 33a0148bf4..6591281f17 100644 --- a/distros/galactic/overrides.nix +++ b/distros/galactic/overrides.nix @@ -2,6 +2,19 @@ self: # Distro package set rosSelf: rosSuper: with rosSelf.lib; { + ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({ + patches ? [], ... + }: { + patches = patches ++ [ + # Support new target export template introduced with CMake 3.24 + (self.fetchpatch { + url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch"; + stripLen = 1; + sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4="; + }) + ]; + }); + gazebo = self.gazebo_11; iceoryx-posh = patchVendorGit rosSuper.iceoryx-posh { diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index fbbd948b5c..9e0ef58a22 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -2,6 +2,19 @@ self: # Distro package set rosSelf: rosSuper: with rosSelf.lib; { + ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({ + patches ? [], ... + }: { + patches = patches ++ [ + # Support new target export template introduced with CMake 3.24 + (self.fetchpatch { + url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch"; + stripLen = 1; + sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4="; + }) + ]; + }); + gazebo = self.gazebo_11; iceoryx-hoofs = rosSuper.iceoryx-hoofs.overrideAttrs ({