diff --git a/distros/build-ros-package/default.nix b/distros/build-ros-package/default.nix
index 75f6f510b1..c10c82f6c8 100644
--- a/distros/build-ros-package/default.nix
+++ b/distros/build-ros-package/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pythonPackages }:
+{ stdenv, lib, pythonPackages, rosDistro, rosVersion }:
 { buildType ? "catkin"
   # Too difficult to fix all the problems with the tests in each package
 , doCheck ? false
@@ -24,6 +24,7 @@ else stdenv.mkDerivation) (args // {
 
   passthru = passthru // {
     rosPackage = true;
+    inherit rosDistro rosVersion;
   };
 } // lib.optionalAttrs (buildType == "ament_python") {
   dontUseCmakeConfigure = true;
diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 46556f6e1e..3a5c29c155 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -17,7 +17,10 @@ let
 
     callPackage = self.newScope rosSelf;
 
-    buildRosPackage = rosSelf.callPackage ./build-ros-package { };
+    buildRosPackage = rosSelf.callPackage ./build-ros-package {
+      rosVersion = version;
+      rosDistro = distro;
+    };
 
     buildEnv = rosSelf.callPackage ./build-env {
       inherit (self) buildEnv;