movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-14 19:48:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add rosVersion and rosDistro to passthru for all ROS packages.

Browse source
This commit is contained in:
Ben Wolsieffer 2022-11-11 14:30:39 -05:00
parent 1c4a82825a
commit aaa3bb7d32
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
distros/build-ros-package/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, pythonPackages }: { stdenv, lib, pythonPackages, rosDistro, rosVersion }:
{ buildType ? "catkin" { buildType ? "catkin"
# Too difficult to fix all the problems with the tests in each package # Too difficult to fix all the problems with the tests in each package
, doCheck ? false , doCheck ? false
@ -24,6 +24,7 @@ else stdenv.mkDerivation) (args // {
passthru = passthru // { passthru = passthru // {
rosPackage = true; rosPackage = true;
inherit rosDistro rosVersion;
}; };
} // lib.optionalAttrs (buildType == "ament_python") { } // lib.optionalAttrs (buildType == "ament_python") {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;

5
distros/distro-overlay.nix
View file

@ -17,7 +17,10 @@ let
callPackage = self.newScope rosSelf; 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 { buildEnv = rosSelf.callPackage ./build-env {
inherit (self) buildEnv; inherit (self) buildEnv;