movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-13 13:40:32 +03:00
Code Activity

buildEnv: Populate GZ_CONFIG_PATH in wrapper

Browse source
This commit is contained in:
hacker1024 2024-10-13 18:55:47 +11:00 • committed by Ben Wolsieffer
parent 76cfc9ec7e
commit 1e05a2eb88
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
distros/build-env/default.nix
View file

@ -10,7 +10,7 @@
#
# By default, all binaries in the environment are wrapped, setting the relevant
# ROS environment variables, allowing use outside of nix-shell.
{ lib, stdenv, buildPackages, writeText, buildEnv, makeWrapper, python, ros-environment }:
{ lib, stdenv, buildPackages, writeText, buildEnv, symlinkJoin, makeWrapper, python, ros-environment }:
{ paths ? [], wrapPrograms ? true, postBuild ? "", passthru ? { }, ... }@args:
with lib;
@ -33,6 +33,11 @@ let
propagatedPaths = propagatePackages paths;
gzEnv = symlinkJoin {
name = "gz-env";
paths = map (pkg: "${pkg}/${pkg.gzConfigPath}") (builtins.filter (pkg: pkg ? gzConfigPath) propagatedPaths.rosPackages);
};
env = (buildEnv ((removeAttrs args [ "wrapPrograms" ]) // {
name = "ros-env";
# Only add ROS packages to environment. The rest are propagated like normal.
@ -63,6 +68,7 @@ let
--prefix CMAKE_PREFIX_PATH : "$out" \
--prefix AMENT_PREFIX_PATH : "$out" \
--prefix ROS_PACKAGE_PATH : "$out/share" \
--prefix GZ_CONFIG_PATH : '${gzEnv}' \
--set ROS_DISTRO '${ros-environment.rosDistro}' \
--set ROS_VERSION '${toString ros-environment.rosVersion}' \
--set ROS_PYTHON_VERSION '${lib.versions.major python.version}' \