actionlib: move override to ros1-overlay.nix

lopsided98 · Aug 9, 2023 · a63266f · a63266f · kjeremy · Aug 10, 2023
1 parent 5c6026e
commit a63266f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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 ? [],