Align with humble

RoboStack · Jan 7, 2025 · ab488ea · ab488ea
1 parent cdb08c2
commit ab488ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -15,11 +15,6 @@ python:
 python_impl:
   - cpython
 
-c_compiler:
-  - ${{ "vs2019" if win }}
-cxx_compiler:
-  - ${{ "vs2019" if win }}
-
 c_stdlib:
   - ${{ "sysroot" if linux }}
   - ${{ "macosx_deployment_target" if osx }}
@@ -28,3 +23,11 @@ c_stdlib_version:
   - ${{ "2.17" if linux }}
   - ${{ "10.14" if osx and x86_64 }}
   - ${{ "11.0" if osx and arm64 }}
+c_compiler:
+  - ${{ "gcc" if linux }}
+  - ${{ "clang" if osx }}
+  - ${{ "vs2019" if win }}
+cxx_compiler:
+  - ${{ "gxx" if linux }}
+  - ${{ "clangxx" if osx }}
+  - ${{ "vs2019" if win }}
diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -34,7 +34,7 @@ intra_process_demo:
   add_host: ["REQUIRE_OPENGL"]
 rviz_ogre_vendor:
   add_host: ["zlib", "freeimage", "freetype", "assimp", "zziplib", "pugixml", "${{ 'libglu' if linux }}"]
-  add_build: ["vcstool", "patch"]
+  add_build: ["vcstool"]
   add_run: ["assimp"]
 pcl_conversions:
   add_host: ["REQUIRE_OPENGL", "libboost-devel"]

diff --git a/pixi.toml b/pixi.toml
@@ -16,7 +16,7 @@ upload = "anaconda -t $ANACONDA_API_TOKEN upload"
 
 [dependencies]
 python = ">=3.11.0,<3.12"
-rattler-build = ">=0.33"
+rattler-build = ">=0.33.2"
 anaconda-client = ">=1.12"
 
 [target.win-64.dependencies]