From a76cac0463e42cb9adf7691adc8972e96b7b13cc Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 25 Jul 2024 20:36:34 -0400
Subject: [PATCH] jsk-recognition-msgs: cleanup patching

* Move to ros1-overlay.nix
* Link to upstream PRs
* Use --replace-fail
---
 distros/distro-overlay.nix |  9 ---------
 distros/ros1-overlay.nix   | 13 +++++++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index fac560f302..0985aae851 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -65,15 +65,6 @@ let
 
     image-cb-detector = patchBoostSignals rosSuper.image-cb-detector;
 
-    jsk-recognition-msgs = rosSuper.jsk-recognition-msgs.overrideAttrs ({
-      buildInputs ? [], postPatch ? "", ...
-    }: {
-      buildInputs = buildInputs ++ [ rosSuper.ros-environment ];
-      postPatch = ''
-        substituteInPlace CMakeLists.txt --replace "catkin_python_setup()" ""
-      '';
-    });
-
     laser-cb-detector = patchBoostSignals rosSuper.laser-cb-detector;
 
     libfranka = rosSuper.libfranka.overrideAttrs ({
diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix
index 1573d0b80c..c75e968d6e 100644
--- a/distros/ros1-overlay.nix
+++ b/distros/ros1-overlay.nix
@@ -71,6 +71,19 @@ rosSelf: rosSuper: with rosSelf.lib; {
     sha256 = "0nryr4hg3lha1aaz35wbqr42lb6l8alfcy6slj2yn2dgb5syrmn2";
   };
 
+  jsk-recognition-msgs = rosSuper.jsk-recognition-msgs.overrideAttrs ({
+    buildInputs ? [], postPatch ? "", ...
+  }: {
+    # Merged upstream
+    # https://github.com/jsk-ros-pkg/jsk_recognition/pull/2836
+    buildInputs = buildInputs ++ [ rosSelf.ros-environment ];
+    # Part of upstream PR
+    # https://github.com/jsk-ros-pkg/jsk_recognition/pull/2829
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace-fail "catkin_python_setup()" ""
+    '';
+  });
+
   libphidgets = patchVendorUrl rosSuper.libphidgets {
     url = "https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget/libphidget_2.1.8.20151217.tar.gz";
     sha256 = "0lpaskqxpklm05050wwvdqwhw30f2hpzss8sgyvczdpvvqzjg4vk";