From a63266f7825b24432dfacf033c3e0ad4e3dc37eb Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 8 Aug 2023 21:23:48 -0400 Subject: [PATCH] actionlib: move override to ros1-overlay.nix --- distros/distro-overlay.nix | 13 ------------- distros/ros1-overlay.nix | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 2d717704d0..7d8cf6e121 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -37,19 +37,6 @@ let overrides = rosSelf: rosSuper: with rosSelf.lib; { # ROS package overrides/fixups - # Fix usages of global Boost placeholders - # https://github.com/ros/actionlib/pull/197 - actionlib = rosSuper.actionlib.overrideAttrs ({ - patches ? [], ... - }: { - patches = patches ++ [ (self.fetchpatch { - url = "https://github.com/lopsided98/actionlib/commit/d675dd75d9080d2832591e0220d19e0f0d981446.patch"; - stripLen = 1; - includes = [ "include/*" ]; - sha256 = "sha256-bB8PkiDisgBgZoDyieiT1dSQK/xSfG8ZZOJyigX0SYY="; - }) ]; - }); - camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers; cob-light = patchBoostSignals rosSuper.cob-light; diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix index a839a0f1f3..c2014a1248 100644 --- a/distros/ros1-overlay.nix +++ b/distros/ros1-overlay.nix @@ -1,6 +1,19 @@ self: rosSelf: rosSuper: with rosSelf.lib; { + # Fix usages of global Boost placeholders + # https://github.com/ros/actionlib/pull/197 + actionlib = rosSuper.actionlib.overrideAttrs ({ + patches ? [], ... + }: { + patches = patches ++ [ (self.fetchpatch { + url = "https://github.com/lopsided98/actionlib/commit/d675dd75d9080d2832591e0220d19e0f0d981446.patch"; + stripLen = 1; + includes = [ "include/*" ]; + sha256 = "sha256-bB8PkiDisgBgZoDyieiT1dSQK/xSfG8ZZOJyigX0SYY="; + }) ]; + }); + catkin = rosSuper.catkin.overrideAttrs ({ propagatedBuildInputs ? [], patches ? [],