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

Foxy already has ament-cmake-export-targets patch.

Browse source
This commit is contained in:
Ben Wolsieffer 2022-09-21 23:31:15 -04:00
parent cfb8dd0497
commit 93cf5a5ba4
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
distros/distro-overlay.nix
View file

@ -61,19 +61,6 @@ let
nativeBuildInputs = [ setupHook ] ++ nativeBuildInputs; nativeBuildInputs = [ setupHook ] ++ nativeBuildInputs;
}); });
ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
# Support new target export template introduced with CMake 3.24
(self.fetchpatch {
url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch";
stripLen = 1;
sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4=";
})
];
});
camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers; camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers;
catkin = rosSuper.catkin.overrideAttrs ({ catkin = rosSuper.catkin.overrideAttrs ({

13
distros/galactic/overrides.nix
View file

@ -2,6 +2,19 @@
self: self:
# Distro package set # Distro package set
rosSelf: rosSuper: with rosSelf.lib; { rosSelf: rosSuper: with rosSelf.lib; {
ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
# Support new target export template introduced with CMake 3.24
(self.fetchpatch {
url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch";
stripLen = 1;
sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4=";
})
];
});
gazebo = self.gazebo_11; gazebo = self.gazebo_11;
iceoryx-posh = patchVendorGit rosSuper.iceoryx-posh { iceoryx-posh = patchVendorGit rosSuper.iceoryx-posh {

13
distros/humble/overrides.nix
View file

@ -2,6 +2,19 @@
self: self:
# Distro package set # Distro package set
rosSelf: rosSuper: with rosSelf.lib; { rosSelf: rosSuper: with rosSelf.lib; {
ament-cmake-export-targets = rosSuper.ament-cmake-export-targets.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
# Support new target export template introduced with CMake 3.24
(self.fetchpatch {
url = "https://github.com/ament/ament_cmake/commit/ca8c26ea3c89e69c0c636b7cd0c088674c689f5f.patch";
stripLen = 1;
sha256 = "sha256-ATdzHaD+3R3rhplaNzkEQBRqpkQDHVJLiB2oNlzIjm4=";
})
];
});
gazebo = self.gazebo_11; gazebo = self.gazebo_11;
iceoryx-hoofs = rosSuper.iceoryx-hoofs.overrideAttrs ({ iceoryx-hoofs = rosSuper.iceoryx-hoofs.overrideAttrs ({