diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix
index cd97355e01..f7ebfdffc4 100644
--- a/distros/humble/overrides.nix
+++ b/distros/humble/overrides.nix
@@ -117,6 +117,19 @@ in with lib; {
     nativeBuildInputs = nativeBuildInputs ++ [ rosSelf.ros-environment ];
   });
 
+  rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
+    postPatch ? "", ...
+  }: let
+    python = rosSelf.python;
+  in {
+    # Fix finding NumPy headers
+    postPatch = postPatch + ''
+      substituteInPlace cmake/rosidl_generator_py_generate_interfaces.cmake \
+       --replace-fail '"import numpy"' "" \
+       --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/core/include'"
+    '';
+  });
+
   rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
     url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
     sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
diff --git a/distros/iron/overrides.nix b/distros/iron/overrides.nix
index 58d4d20cde..a4b6523a6c 100644
--- a/distros/iron/overrides.nix
+++ b/distros/iron/overrides.nix
@@ -63,6 +63,19 @@ in with lib; {
     fetchgitArgs.hash = "sha256-f7GZgOzUrkAfw1mqwlIKQQqDvkvIahGlHvq6AL+aAvA=";
   };
 
+  rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
+    postPatch ? "", ...
+  }: let
+    python = rosSelf.python;
+  in {
+    # Fix finding NumPy headers
+    postPatch = postPatch + ''
+      substituteInPlace cmake/rosidl_generator_py_generate_interfaces.cmake \
+       --replace-fail '"import numpy"' "" \
+       --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/core/include'"
+    '';
+  });
+
   rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
     postPatch ? "", ...
   }: let
diff --git a/distros/jazzy/overrides.nix b/distros/jazzy/overrides.nix
index acd26af348..4894814a76 100644
--- a/distros/jazzy/overrides.nix
+++ b/distros/jazzy/overrides.nix
@@ -62,6 +62,19 @@ in {
     hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE=";
   };
 
+  rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
+    postPatch ? "", ...
+  }: let
+    python = rosSelf.python;
+  in {
+    # Fix finding NumPy headers
+    postPatch = postPatch + ''
+      substituteInPlace cmake/rosidl_generator_py_generate_interfaces.cmake \
+       --replace-fail '"import numpy"' "" \
+       --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/core/include'"
+    '';
+  });
+
   rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor {
     url = "https://github.com/OGRECave/ogre.git";
     rev = "v1.12.10";
diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix
index ae595a4b64..775652ab09 100644
--- a/distros/ros2-overlay.nix
+++ b/distros/ros2-overlay.nix
@@ -126,17 +126,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
       buildInputs;
   });
 
-  rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
-    postPatch ? "", ...
-  }: let
-    python = rosSelf.python;
-  in {
-    # Fix finding NumPy headers
-    postPatch = postPatch + ''
-      substituteInPlace cmake/rosidl_generator_py_generate_interfaces.cmake \
-       --replace-fail '"import numpy"' "" \
-       --replace-fail 'numpy.get_include()' "'${python.pkgs.numpy}/${python.sitePackages}/numpy/core/include'"
-    '';
+  rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({ ... }: {
     setupHook = ./rosidl-generator-py-setup-hook.sh;
   });