From 123b5ce6a23c38a511be1ced2b254e9a16a2d840 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 15 Nov 2024 14:03:51 -0500
Subject: [PATCH] Only apply geometric-shapes override on rolling and jazzy

Older distros don't need it.
---
 distros/jazzy/overrides.nix   | 11 +++++++++++
 distros/rolling/overrides.nix | 11 +++++++++++
 distros/ros2-overlay.nix      | 11 -----------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/distros/jazzy/overrides.nix b/distros/jazzy/overrides.nix
index f89e7b4a49..d9b2f1e271 100644
--- a/distros/jazzy/overrides.nix
+++ b/distros/jazzy/overrides.nix
@@ -25,6 +25,17 @@ in {
 
   gazebo = self.gazebo_11;
 
+  geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
+      postPatch ? "", ...
+  }: {
+      # Remove workaround for Ubuntu-specific dependency hell issue
+      postPatch = postPatch + ''
+        substituteInPlace CMakeLists.txt --replace-fail \
+          'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+          'find_package(octomap REQUIRED)'
+      '';
+  });
+
   google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor {
     url = "https://github.com/google/benchmark.git";
     rev = "344117638c8ff7e239044fd0fa7085839fc03021";
diff --git a/distros/rolling/overrides.nix b/distros/rolling/overrides.nix
index 6bb1e2c406..2c8addbe22 100644
--- a/distros/rolling/overrides.nix
+++ b/distros/rolling/overrides.nix
@@ -25,6 +25,17 @@ in {
 
   gazebo = self.gazebo_11;
 
+  geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
+      postPatch ? "", ...
+  }: {
+      # Remove workaround for Ubuntu-specific dependency hell issue
+      postPatch = postPatch + ''
+        substituteInPlace CMakeLists.txt --replace-fail \
+          'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+          'find_package(octomap REQUIRED)'
+      '';
+  });
+
   google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor {
     url = "https://github.com/google/benchmark.git";
     rev = "344117638c8ff7e239044fd0fa7085839fc03021";
diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix
index 4f0ba34031..a817cfcbff 100644
--- a/distros/ros2-overlay.nix
+++ b/distros/ros2-overlay.nix
@@ -59,17 +59,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
     fetchgitArgs.hash = "sha256-i8EtjPMg39S/3RyoUaXm5A8Nu/NbgAwjxRCdyh2elyU=";
   };
 
-  geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
-      postPatch ? "", ...
-  }: {
-      # Remove workaround for Ubuntu-specific dependency hell issue
-      postPatch = postPatch + ''
-        substituteInPlace CMakeLists.txt --replace-fail \
-          'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
-          'find_package(octomap REQUIRED)'
-      '';
-  });
-
   gmock-vendor = rosSuper.gmock-vendor.overrideAttrs ({
     nativeBuildInputs ? [], ...
   }: {