diff --git a/distros/build-ros-package/default.nix b/distros/build-ros-package/default.nix
index fb1befcb89..b59980b16e 100644
--- a/distros/build-ros-package/default.nix
+++ b/distros/build-ros-package/default.nix
@@ -18,8 +18,6 @@ else stdenv.mkDerivation) (args // {
   passthru = passthru // {
     rosPackage = true;
   };
-} // (if buildType == "ament_python" then {
+} // lib.optionalAttrs (buildType == "ament_python") {
   dontUseCmakeConfigure = true;
-} else {
-  nativeBuildInputs = [ pythonPackages.wrapPython ] ++ nativeBuildInputs;
-}))
+})
diff --git a/distros/catkin-setup-hook/default.nix b/distros/catkin-setup-hook/default.nix
index ed35e10fbc..d87c7a85d6 100644
--- a/distros/catkin-setup-hook/default.nix
+++ b/distros/catkin-setup-hook/default.nix
@@ -1,10 +1,5 @@
 { makeSetupHook }:
 
-distro:
-
 makeSetupHook {
   name = "catkin-setup-hook";
-  substitutions = {
-    inherit distro;
-  };
 } ./setup-hook.sh
diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index a92759ee6e..9a649db412 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -38,7 +38,7 @@ let
       prePhases ? [],
       postPatch ? "", ...
     }: let
-      setupHook = self.callPackage ./catkin-setup-hook { } distro;
+      setupHook = self.callPackage ./catkin-setup-hook { };
     in {
       propagatedBuildInputs = [ self.cmake setupHook ] ++ propagatedBuildInputs;