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

Only apply geometric-shapes override on rolling and jazzy

Browse source 
Older distros don't need it.
This commit is contained in:
Ben Wolsieffer 2024-11-15 14:03:51 -05:00
parent e819a93712
commit 123b5ce6a2
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
distros/jazzy/overrides.nix
View file

@ -25,6 +25,17 @@ in {
gazebo = self.gazebo_11; gazebo = self.gazebo_11;
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor { google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor {
url = "https://github.com/google/benchmark.git"; url = "https://github.com/google/benchmark.git";
rev = "344117638c8ff7e239044fd0fa7085839fc03021"; rev = "344117638c8ff7e239044fd0fa7085839fc03021";

11
distros/rolling/overrides.nix
View file

@ -25,6 +25,17 @@ in {
gazebo = self.gazebo_11; gazebo = self.gazebo_11;
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor { google-benchmark-vendor = lib.patchExternalProjectGit rosSuper.google-benchmark-vendor {
url = "https://github.com/google/benchmark.git"; url = "https://github.com/google/benchmark.git";
rev = "344117638c8ff7e239044fd0fa7085839fc03021"; rev = "344117638c8ff7e239044fd0fa7085839fc03021";

11
distros/ros2-overlay.nix
View file

@ -59,17 +59,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
fetchgitArgs.hash = "sha256-i8EtjPMg39S/3RyoUaXm5A8Nu/NbgAwjxRCdyh2elyU="; fetchgitArgs.hash = "sha256-i8EtjPMg39S/3RyoUaXm5A8Nu/NbgAwjxRCdyh2elyU=";
}; };
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
postPatch ? "", ...
}: {
# Remove workaround for Ubuntu-specific dependency hell issue
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
gmock-vendor = rosSuper.gmock-vendor.overrideAttrs ({ gmock-vendor = rosSuper.gmock-vendor.overrideAttrs ({
nativeBuildInputs ? [], ... nativeBuildInputs ? [], ...
}: { }: {