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

galatic: rviz-rendering: remove upstreamed patch

Browse source
This commit is contained in:
Ben Wolsieffer 2022-05-07 19:10:26 -04:00
parent 2b49389898
commit c1bbb33685
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
distros/distro-overlay.nix
View file

@ -412,19 +412,6 @@ let
'' + preFixup;
});
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/827
rviz-rendering = rosSuper.rviz-rendering.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-1kYIrcdm7mu39OFXeDmMWGJygeTKr1fc6ECbM5hf3ZU=";
stripLen = 1;
includes = [ "CMakeLists.txt" ];
}) ];
});
rxcpp-vendor = patchVendorUrl rosSuper.rxcpp-vendor {
url = "https://github.com/ReactiveX/RxCpp/archive/v4.1.0.tar.gz";
sha256 = "1smxrcm0s6bz05185dx1i2xjgn47rq7m247pblil6p3bmk3lkfyk";

13
distros/foxy/overrides.nix
View file

@ -44,6 +44,19 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
};
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/827
rviz-rendering = rosSuper.rviz-rendering.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-1kYIrcdm7mu39OFXeDmMWGJygeTKr1fc6ECbM5hf3ZU=";
stripLen = 1;
includes = [ "CMakeLists.txt" ];
}) ];
});
yaml-cpp-vendor = rosSuper.yaml-cpp-vendor.overrideAttrs ({
patches ? [], ...
}: {