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

cv-bridge: fix UB bug with GCC 8

Browse source
This commit is contained in:
Ben Wolsieffer 2020-03-03 18:55:09 -05:00
parent 55b68cca18
commit db3ae84456
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
distros/distro-overlay.nix
View file

@ -66,8 +66,14 @@ let
cob-light = patchBoostSignals rosSuper.cob-light; cob-light = patchBoostSignals rosSuper.cob-light;
cv-bridge = (patchBoostPython rosSuper.cv-bridge).overrideAttrs ({ cv-bridge = (patchBoostPython rosSuper.cv-bridge).overrideAttrs ({
patches ? [],
propagatedBuildInputs ? [], ... propagatedBuildInputs ? [], ...
}: { }: {
patches = patches ++ [ (self.fetchpatch {
url = "https://github.com/ros-perception/vision_opencv/commit/fbfb25303bd77db6a5943043cc4303d0c0b835c9.patch";
sha256 = "0pznlbqp99f6bzql3q1sjy9sqk2746wgp7qdqj790j5z0vb2v2r6";
stripLen = 1;
}) ];
propagatedBuildInputs = propagatedBuildInputs ++ [ rosSelf.pythonPackages.opencv3 ]; propagatedBuildInputs = propagatedBuildInputs ++ [ rosSelf.pythonPackages.opencv3 ];
}); });
@ -142,12 +148,10 @@ let
librealsense = rosSuper.librealsense.overrideAttrs ({ librealsense = rosSuper.librealsense.overrideAttrs ({
patches ? [], ... patches ? [], ...
}: { }: {
patches = patches ++ [ patches = patches ++ [ (self.fetchpatch {
(self.fetchpatch { url = "https://github.com/IntelRealSense/librealsense/commit/86e434c86096b91a722f22bd039c2b6eeb8174ab.patch";
url = "https://github.com/IntelRealSense/librealsense/commit/86e434c86096b91a722f22bd039c2b6eeb8174ab.patch"; sha256 = "1kcvm32cx9zzd56k9yglnyxizmfgar3a6cybjdwpyf6ljrxjlpp5";
sha256 = "1kcvm32cx9zzd56k9yglnyxizmfgar3a6cybjdwpyf6ljrxjlpp5"; }) ];
})
];
}); });
libuvc-camera = rosSuper.libuvc-camera.overrideAttrs ({ libuvc-camera = rosSuper.libuvc-camera.overrideAttrs ({