From 69b0ca170a7bbfc1617d96d45d6786966bbe02c3 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 14 Nov 2020 14:53:22 -0500
Subject: [PATCH] Fix python-orocos-kdl patch backport for kinetic.

---
 distros/distro-overlay.nix    | 10 ----------
 distros/kinetic/overrides.nix | 10 ++++++++++
 distros/melodic/overrides.nix | 10 ++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index bcdfd3460b..cb4aa7d5f9 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -198,16 +198,6 @@ let
       '';
     });
 
-    python-orocos-kdl = rosSuper.python-orocos-kdl.overrideAttrs ({
-      patches ? [], ...
-    }: {
-      patches = patches ++ [ (self.fetchpatch {
-        url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch";
-        sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg";
-        stripLen = 1;
-      }) ];
-    });
-
     pr2-tilt-laser-interface = patchBoostSignals rosSuper.pr2-tilt-laser-interface;
 
     python-qt-binding = rosSuper.python-qt-binding.overrideAttrs ({
diff --git a/distros/kinetic/overrides.nix b/distros/kinetic/overrides.nix
index 928adb2916..3a44a5237b 100644
--- a/distros/kinetic/overrides.nix
+++ b/distros/kinetic/overrides.nix
@@ -96,6 +96,16 @@ rosSelf: rosSuper: with rosSelf.lib; {
   # Ubuntu versions did not have one. We don't need to use this.
   inherit (self) opencv3;
 
+  python-orocos-kdl = rosSuper.python-orocos-kdl.overrideAttrs ({
+    patches ? [], ...
+  }: {
+    patches = patches ++ [ (self.fetchpatch {
+      url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/25c264c759bd29a0a5c78f1b1ab02645543ddccb.patch";
+      sha256 = "0gl9ynicblfbjc656i5xvcvg40zhn20m2k3yxdajrg16z568b3zs";
+      stripLen = 1;
+    }) ];
+  });
+
   realsense-camera = rosSuper.realsense-camera.overrideAttrs ({
     buildInputs ? [], ...
   }: {
diff --git a/distros/melodic/overrides.nix b/distros/melodic/overrides.nix
index 74d18ae215..014663dab1 100644
--- a/distros/melodic/overrides.nix
+++ b/distros/melodic/overrides.nix
@@ -29,6 +29,16 @@ rosSelf: rosSuper: with rosSelf.lib; {
     ];
   });
 
+  python-orocos-kdl = rosSuper.python-orocos-kdl.overrideAttrs ({
+    patches ? [], ...
+  }: {
+    patches = patches ++ [ (self.fetchpatch {
+      url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch";
+      sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg";
+      stripLen = 1;
+    }) ];
+  });
+
   rosfmt = patchVendorUrl rosSuper.rosfmt {
     url = "https://github.com/fmtlib/fmt/releases/download/6.0.0/fmt-6.0.0.zip";
     sha256 = "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl";