movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-10 01:42:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d7119336da into 2435baa8ac

Browse source
This commit is contained in:
Steve Walker 2025-06-03 13:39:40 +10:00 • committed by GitHub
commit 65d7a8f2bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distros/jazzy/overrides.nix
View file

@ -97,7 +97,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"

2
distros/rolling/overrides.nix
View file

@ -97,7 +97,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"

21
distros/ros2-overlay.nix
View file

@ -289,7 +289,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"
@ -302,6 +302,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.