diff --git a/distros/jazzy/overrides.nix b/distros/jazzy/overrides.nix
index 687cf67c86..4b75dd889a 100644
--- a/distros/jazzy/overrides.nix
+++ b/distros/jazzy/overrides.nix
@@ -144,7 +144,7 @@ in {
       self.qt5.qtgraphicaleffects
       self.pkg-config
     ];
-    qtWrapperArgs = qtWrapperArgs ++ [
+    qtWrapperArgs = qtWrapperArgs ++ lib.optionals self.stdenv.isLinux [
       # Gazebo is currently broken on Wayland
       # https://gazebosim.org/docs/ionic/troubleshooting/#wayland-issues
       "--set-default QT_QPA_PLATFORM xcb"
diff --git a/distros/rolling/overrides.nix b/distros/rolling/overrides.nix
index f53e0ac002..c78d0f8353 100644
--- a/distros/rolling/overrides.nix
+++ b/distros/rolling/overrides.nix
@@ -144,7 +144,7 @@ in {
       self.qt5.qtgraphicaleffects
       self.pkg-config
     ];
-    qtWrapperArgs = qtWrapperArgs ++ [
+    qtWrapperArgs = qtWrapperArgs ++ lib.optionals self.stdenv.isLinux [
       # Gazebo is currently broken on Wayland
       # https://gazebosim.org/docs/ionic/troubleshooting/#wayland-issues
       "--set-default QT_QPA_PLATFORM xcb"
diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix
index 47a7b55829..01094fdb2a 100644
--- a/distros/ros2-overlay.nix
+++ b/distros/ros2-overlay.nix
@@ -235,7 +235,7 @@ rosSelf: rosSuper: with rosSelf.lib; {
   }: {
     dontWrapQtApps = false;
     nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
-    qtWrapperArgs = qtWrapperArgs ++ [
+    qtWrapperArgs = qtWrapperArgs ++ optionals self.stdenv.isLinux [
       # Use X11 by default in RViz2.
       # https://github.com/ros-visualization/rviz/issues/1442
       "--set-default QT_QPA_PLATFORM xcb"
@@ -248,6 +248,25 @@ rosSelf: rosSuper: with rosSelf.lib; {
     };
   });
 
+  rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
+    nativeBuildInputs ? [], ...
+  }: {
+    nativeBuildInputs = nativeBuildInputs ++ optionals self.stdenv.isDarwin [
+      self.darwin.apple_sdk.frameworks.Foundation
+      self.darwin.apple_sdk.frameworks.AppKit
+    ];
+  });
+
+  # lttng-ust and lttng-tools is not available on Darwin, will disable tracking if not available.
+  tracetools = rosSuper.tracetools.overrideAttrs ({
+    propagatedBuildInputs ? [], ...
+  }: {
+    propagatedBuildInputs = if self.stdenv.isDarwin then
+      builtins.filter (p: !hasPrefix "lttng" p.pname) propagatedBuildInputs
+    else
+      propagatedBuildInputs;
+  });
+
   # The build gets stuck in an infinite loop with absolute CMAKE_INSTALL_LIBDIR:
   # https://github.com/lagadic/visp/blob/9f1997ad17688c2d104cf2b29b57382c5d0af960/cmake/VISPGenerateConfig.cmake#L46
   # Also has the standard bad assumptions that CMAKE_INSTALL_*DIR is relative.