From 7dccaecbf39eca9b816bde83d17c0d43b905aa45 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 21 Jul 2024 20:40:05 +1000 Subject: [PATCH] Add moveit-servo on osx-arm64 (#474) * Add moveit-servo * Add moveit-servo to win-64 * No spnav on Win * No spnav on Win * No moveit-servo on Win --- conda.yaml | 10 ++++++++-- robostack.yaml | 10 ++++++++-- vinca_osx_arm64.yaml | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/conda.yaml b/conda.yaml index dcaf5de43..1216e0693 100644 --- a/conda.yaml +++ b/conda.yaml @@ -400,7 +400,10 @@ libreadline-dev: libsndfile1-dev: conda: [libsndfile] libspnav-dev: - conda: [libspnav] + conda: + linux: [libspnav] + osx: [libspnav] + win64: [] libsqlite3-dev: conda: [sqlite 3.*] libssl-dev: @@ -875,7 +878,10 @@ sdl2: socat: conda: [socat] spacenavd: - conda: [libspnav] + conda: + linux: [libspnav] + osx: [libspnav] + win64: [] spdlog: conda: [spdlog] sshpass: diff --git a/robostack.yaml b/robostack.yaml index cea766c73..d7e1fe368 100644 --- a/robostack.yaml +++ b/robostack.yaml @@ -398,7 +398,10 @@ libreadline-dev: libsndfile1-dev: robostack: [libsndfile] libspnav-dev: - robostack: [libspnav] + robostack: + linux: [libspnav] + osx: [libspnav] + win64: [] libsqlite3-dev: robostack: [sqlite 3.*] libssl-dev: @@ -890,7 +893,10 @@ sdl2: socat: robostack: [socat] spacenavd: - robostack: [libspnav] + robostack: + linux: [libspnav] + osx: [libspnav] + win64: [] spdlog: robostack: [spdlog] sshpass: diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml index f75416528..7c7c5892e 100644 --- a/vinca_osx_arm64.yaml +++ b/vinca_osx_arm64.yaml @@ -79,6 +79,7 @@ packages_select_by_deps: - desktop - perception - moveit + - moveit-servo # - eigenpy # needs manual build - turtlebot3 - turtlebot3-simulations