Skip to content

Commit

Permalink
Merge pull request #38 from RoboStack/fix-foonathan
Browse files Browse the repository at this point in the history
Fix foonathan issues
  • Loading branch information
Tobias-Fischer authored Dec 16, 2022
2 parents 0125b17 + 363e7f0 commit 6220bba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion vinca/templates/activate.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ else
fi

case "$OSTYPE" in
darwin*) export ROS_OS_OVERRIDE="conda:osx";;
darwin*) export ROS_OS_OVERRIDE="conda:osx"; export RMW_IMPLEMENTATION="rmw_cyclonedds_cpp";;
linux*) export ROS_OS_OVERRIDE="conda:linux";;
esac

Expand Down
1 change: 1 addition & 0 deletions vinca/templates/deactivate.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ unset ROS_OS_OVERRIDE
# unset QT_PLUGIN_PATH
unset ROS_LOCALHOST_ONLY
unset ament_python_executable
unset RMW_IMPLEMENTATION

0 comments on commit 6220bba

Please sign in to comment.