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

galactic: rviz-assimp-vendor: remove upstreamed patch

Browse source
This commit is contained in:
Ben Wolsieffer 2022-05-07 17:26:04 -04:00
parent e06ceec839
commit 5168fce9f4
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

@ -403,19 +403,6 @@ let
'';
});
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/827
rviz-assimp-vendor = rosSuper.rviz-assimp-vendor.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-JW3GgSukrWR19je35crNeQNSDR6ZRoFRzpR/MBcwMws=";
stripLen = 1;
includes = [ "rviz_assimp_vendor-extras.cmake.in" ];
}) ];
});
rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({
preFixup ? "", ...
}: {

13
distros/foxy/overrides.nix
View file

@ -26,6 +26,19 @@ rosSelf: rosSuper: with rosSelf.lib; {
] ++ patches;
});
# Fix compatibility with assimp 5.1
# https://github.com/ros2/rviz/pull/827
rviz-assimp-vendor = rosSuper.rviz-assimp-vendor.overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros2/rviz/commit/95ddcea7459cc4faf9954ba018491d1eea8d4280.patch";
sha256 = "sha256-JW3GgSukrWR19je35crNeQNSDR6ZRoFRzpR/MBcwMws=";
stripLen = 1;
includes = [ "rviz_assimp_vendor-extras.cmake.in" ];
}) ];
});
rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";