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

moveit2: apply fix globally for all distros

Browse source
This commit is contained in:
Viktor Pocedulić 2024-10-25 09:41:49 +02:00 • committed by Ben Wolsieffer
parent dccccc346c
commit 5034180018
2 changed files with 64 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

64
distros/distro-overlay.nix
View file

@ -93,6 +93,16 @@ let
setupHook = ./gazebo-ros-setup-hook.sh; setupHook = ./gazebo-ros-setup-hook.sh;
}); });
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
postPatch ? "", ...
}: {
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
gmapping = patchBoostSignals rosSuper.gmapping; gmapping = patchBoostSignals rosSuper.gmapping;
image-cb-detector = patchBoostSignals rosSuper.image-cb-detector; image-cb-detector = patchBoostSignals rosSuper.image-cb-detector;
@ -166,6 +176,60 @@ let
''; '';
}); });
moveit-core = rosSuper.moveit-core.overrideAttrs({
postPatch ? "", ...
}: {
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs({
postPatch ? "", ...
}: {
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
'find_package(octomap REQUIRED)'
'';
});
osqp-vendor = pipe rosSuper.osqp-vendor [
# Make CMakeLists.txt amenable to automatic patching by the next step.
(pkg: pkg.overrideAttrs ({ prePatch ? "", ... }: {
prePatch = prePatch + ''
substituteInPlace CMakeLists.txt --replace-fail \
'set(git_tag "v0.6.2")' \
'set(git_tag "v0.6.2")' # fail when upstream version changes
substituteInPlace CMakeLists.txt --replace-fail \
'GIT_TAG ''${git_tag}' \
'GIT_TAG v0.6.2'
'';
}))
(pkg: patchExternalProjectGit pkg {
url = "https://github.com/osqp/osqp.git";
rev = "v0.6.2";
fetchgitArgs = {
hash = "sha256-0BbUe1J9qzvyKDBLTz+pAEmR3QpRL+hnxZ2re/3mEvs=";
leaveDotGit = true;
};
})
# osqp installs into both lib/cmake/ and lib64/cmake/ which is problematic
# because moveLib64 doesn't attempt to merge overlapping directories but
# fails instead. Here we do the merge manually.
(pkg: pkg.overrideAttrs ({ preInstall ? "", ... }: {
preInstall = preInstall + ''
mkdir -p ./osqp_install/lib/cmake/osqp
mv ./osqp_install/lib64/cmake/osqp/* ./osqp_install/lib/cmake/osqp
rm -r ./osqp_install/lib64/cmake
'';
}))
];
ompl = rosSuper.ompl.overrideAttrs ({ ompl = rosSuper.ompl.overrideAttrs ({
patches ? [], ... patches ? [], ...
}: { }: {

54
distros/jazzy/overrides.nix
View file

@ -25,14 +25,6 @@ in {
gazebo = self.gazebo_11; gazebo = self.gazebo_11;
geometric-shapes = rosSuper.geometric-shapes.overrideAttrs({
postPatch ? "", ...
}: {
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";
@ -192,52 +184,6 @@ in {
hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE="; hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE=";
}; };
moveit-core = rosSuper.moveit-core.overrideAttrs({
postPatch ? "", ...
}: {
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail 'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' 'find_package(octomap REQUIRED)'
'';
});
moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs({
postPatch ? "", ...
}: {
postPatch = postPatch + ''
substituteInPlace CMakeLists.txt --replace-fail 'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' 'find_package(octomap REQUIRED)'
'';
});
osqp-vendor = lib.pipe rosSuper.osqp-vendor [
# Make CMakeLists.txt amenable to automatic patching by the next step.
(pkg: pkg.overrideAttrs ({ prePatch ? "", ... }: {
prePatch = prePatch + ''
substituteInPlace CMakeLists.txt --replace-fail 'set(git_tag "v0.6.2")' 'set(git_tag "v0.6.2")' # fail when upstream version changes
substituteInPlace CMakeLists.txt --replace-fail 'GIT_TAG ''${git_tag}' 'GIT_TAG v0.6.2'
'';
}))
(pkg: lib.patchExternalProjectGit pkg {
url = "https://github.com/osqp/osqp.git";
rev = "v0.6.2";
fetchgitArgs = {
hash = "sha256-0BbUe1J9qzvyKDBLTz+pAEmR3QpRL+hnxZ2re/3mEvs=";
leaveDotGit = true;
};
})
# osqp installs into both lib/cmake/ and lib64/cmake/ which is problematic
# because moveLib64 doesn't attempt to merge overlapping directories but
# fails instead. Here we do the merge manually.
(pkg: pkg.overrideAttrs ({ preInstall ? "", ... }: {
preInstall = preInstall + ''
mkdir -p ./osqp_install/lib/cmake/osqp
mv ./osqp_install/lib64/cmake/osqp/* ./osqp_install/lib/cmake/osqp
rm -r ./osqp_install/lib64/cmake
'';
}))
];
rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor { rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre.git"; url = "https://github.com/OGRECave/ogre.git";
rev = "v1.12.10"; rev = "v1.12.10";