From b1d33e431eded1442e0c7c99fddfb5a8d06a9532 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 8 Jan 2022 16:31:28 -0500 Subject: [PATCH] actionlib: fix Boost placeholders --- distros/distro-overlay.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 4c1f3df699..9b9b2ed8bb 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -41,6 +41,19 @@ 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="; + }) ]; + }); + ament-cmake-core = rosSuper.ament-cmake-core.overrideAttrs ({ ... }: { setupHook = ./ament-cmake-core-setup-hook.sh; });