diff --git a/distros/melodic/overrides.nix b/distros/melodic/overrides.nix
index d03cf465d1..73eb42a0ff 100644
--- a/distros/melodic/overrides.nix
+++ b/distros/melodic/overrides.nix
@@ -97,7 +97,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
     sha256 = "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl";
   };
 
-  # Spends an hour time trying to download npm packages before failing.
+  # Spends an hour trying to download npm packages before failing.
   vapor-master = rosSuper.vapor-master.overrideAttrs ({
     meta ? {}, ...
   }: {
diff --git a/distros/ros1-overlay.nix b/distros/ros1-overlay.nix
index d5d2153316..67a2a3cec8 100644
--- a/distros/ros1-overlay.nix
+++ b/distros/ros1-overlay.nix
@@ -51,6 +51,8 @@ rosSelf: rosSuper: with rosSelf.lib; {
     nativeBuildInputs = nativeBuildInputs ++ [ self.pkg-config ];
   });
 
+  roscpp = patchBoostSignals rosSuper.roscpp;
+
   # rviz does not support shiboken/pyside2 and SIP4 is broken with the latest
   # pyqt5. This applies a patch to make pyqt5 compatible with SIP 4 and uses
   # SIP 4 with python-qt-binding for rviz only.
@@ -89,6 +91,4 @@ rosSelf: rosSuper: with rosSelf.lib; {
       wrapQtApp "$out/lib/rviz/rviz"
     '';
   });
-
-  roscpp = patchBoostSignals rosSuper.roscpp;
 }