movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-14 06:00:38 +03:00
Code Activity

Only apply cyclonedds patch on humble.

Browse source
This commit is contained in:
Ben Wolsieffer 2022-11-10 15:48:33 -05:00
parent b178c3fddb
commit feb0da07a3
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
distros/humble/overrides.nix
View file

@ -15,6 +15,19 @@ rosSelf: rosSuper: with rosSelf.lib; {
];
});
cyclonedds = rosSuper.cyclonedds.overrideAttrs ({
patches ? [], ...
}: {
patches = [
# Fix paths in pkg-config file
# https://github.com/eclipse-cyclonedds/cyclonedds/pull/1453
(self.fetchpatch {
url = "https://github.com/eclipse-cyclonedds/cyclonedds/commit/3ff967e32b8078d497a8b9c70735849c04eaebf6.patch";
hash = "sha256-F5zofoO0YbYfqLrb6s30un9k9+R8rQazLHw+uND1UxE=";
})
];
});
gazebo = self.gazebo_11;
iceoryx-hoofs = rosSuper.iceoryx-hoofs.overrideAttrs ({

10
distros/ros2-overlay.nix
View file

@ -13,18 +13,8 @@ rosSelf: rosSuper: with rosSelf.lib; {
});
cyclonedds = rosSuper.cyclonedds.overrideAttrs ({
patches ? [],
cmakeFlags ? [], ...
}: {
patches = [
# Fix paths in pkg-config file
# https://github.com/eclipse-cyclonedds/cyclonedds/pull/1453
(self.fetchpatch {
url = "https://github.com/eclipse-cyclonedds/cyclonedds/commit/3ff967e32b8078d497a8b9c70735849c04eaebf6.patch";
hash = "sha256-F5zofoO0YbYfqLrb6s30un9k9+R8rQazLHw+uND1UxE=";
})
];
cmakeFlags = cmakeFlags ++ [
# Tries to download something with maven
"-DBUILD_IDLC=OFF"