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

[fix] gz setup and apply suggestions from wentasah

Browse source
This commit is contained in:
Bernd Müller 2024-09-20 00:13:03 +02:00 • committed by Ben Wolsieffer
parent 31c1e5f7df
commit a20dfec18d
4 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
distros/jazzy/overrides.nix
View file

@ -118,10 +118,22 @@ in {
hash = "sha256-zSiPHEh3h2J8hGL342tde5U9FLaGnWs72WD9BqyPf6E="; hash = "sha256-zSiPHEh3h2J8hGL342tde5U9FLaGnWs72WD9BqyPf6E=";
}; };
gz-tools-vendor = lib.patchGzAmentVendorGit rosSuper.gz-tools-vendor { gz-tools-vendor = (lib.patchGzAmentVendorGit rosSuper.gz-tools-vendor {
version = "2.0.1"; version = "2.0.1";
hash = "sha256-sV/T53oVk1fgjwqn/SRTaPTukt+vAlGGxGvTN8+G6Mo="; hash = "sha256-sV/T53oVk1fgjwqn/SRTaPTukt+vAlGGxGvTN8+G6Mo=";
}; }).overrideAttrs({
nativeBuildInputs ? [], propagatedNativeBuildInputs ? [], qtWrapperArgs ? [], postFixup ? "", ...
}: {
nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ [self.qt5.qtquickcontrols2 self.qt5.qtgraphicaleffects self.pkg-config];
qtWrapperArgs = qtWrapperArgs ++ [
# Use X11 by default
"--set-default QT_QPA_PLATFORM xcb"
];
postFixup = postFixup + ''
wrapQtApp "$out/opt/gz_tools_vendor/bin/gz"
'';
});
gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor {
version = "13.4.0"; version = "13.4.0";

16
distros/rolling/overrides.nix
View file

@ -118,10 +118,22 @@ in {
hash = "sha256-zSiPHEh3h2J8hGL342tde5U9FLaGnWs72WD9BqyPf6E="; hash = "sha256-zSiPHEh3h2J8hGL342tde5U9FLaGnWs72WD9BqyPf6E=";
}; };
gz-tools-vendor = lib.patchGzAmentVendorGit rosSuper.gz-tools-vendor { gz-tools-vendor = (lib.patchGzAmentVendorGit rosSuper.gz-tools-vendor {
version = "2.0.1"; version = "2.0.1";
hash = "sha256-sV/T53oVk1fgjwqn/SRTaPTukt+vAlGGxGvTN8+G6Mo="; hash = "sha256-sV/T53oVk1fgjwqn/SRTaPTukt+vAlGGxGvTN8+G6Mo=";
}; }).overrideAttrs({
nativeBuildInputs ? [], propagatedNativeBuildInputs ? [], qtWrapperArgs ? [], postFixup ? "", ...
}: {
nativeBuildInputs = nativeBuildInputs ++ [ self.qt5.wrapQtAppsHook ];
propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ [self.qt5.qtquickcontrols2 self.qt5.qtgraphicaleffects self.pkg-config];
qtWrapperArgs = qtWrapperArgs ++ [
# Use X11 by default
"--set-default QT_QPA_PLATFORM xcb"
];
postFixup = postFixup + ''
wrapQtApp "$out/opt/gz_tools_vendor/bin/gz"
'';
});
gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor { gz-transport-vendor = lib.patchGzAmentVendorGit rosSuper.gz-transport-vendor {
version = "13.4.0"; version = "13.4.0";

1
examples/ros2-gz-example.nix
View file

@ -35,7 +35,6 @@ with rosPackages.jazzy;
]; ];
}) })
]; ];
GZ_CONFIG_PATH = "${gz-tools-vendor}/opt/gz_tools_vendor/share/gz:${gz-gui-vendor}/opt/gz_gui_vendor/share/gz\:${gz-cmake-vendor}/opt/gz_cmake_vendor/share/gz\:${gz-fuel-tools-vendor}/opt/gz_fuel_tools_vendor/share/gz\:${gz-launch-vendor}/opt/gz_launch_vendor/share/gz\:${gz-math-vendor}/opt/gz_math_vendor/share/gz\:${gz-msgs-vendor}/opt/gz_msgs_vendor/share/gz\:${gz-physics-vendor}/opt/gz_physics_vendor/share/gz\:${gz-plugin-vendor}/opt/gz_plugin_vendor/share/gz\:${gz-rendering-vendor}/opt/gz_rendering_vendor/share/gz\:${gz-sensors-vendor}/opt/gz_sensors_vendor/share/gz\:${gz-sim-vendor}/opt/gz_sim_vendor/share/gz\:${gz-transport-vendor}/opt/gz_transport_vendor/share/gz\:${gz-utils-vendor}/opt/gz_utils_vendor/share/gz";
shellHook = '' shellHook = ''
unset QT_QPA_PLATFORM unset QT_QPA_PLATFORM
''; '';

6
lib/default.nix
View file

@ -137,6 +137,12 @@
endif() endif()
EOF EOF
''; '';
preBuild = ''
find . -name "*build.make" -print -exec sed -i "s#var/empty#opt#g" {} \;
'';
setupHook = self.writeText "${pname}-setup-hook.sh" ''
addToSearchPath GZ_CONFIG_PATH "@out@/opt/${lib.replaceStrings ["-"] ["_"] stem}_vendor/share/gz"
'';
}); });
patchBoostPython = pkg: pkg.overrideAttrs ({ patchBoostPython = pkg: pkg.overrideAttrs ({