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

jsk-recognition-msgs: cleanup patching

Browse source 
* Move to ros1-overlay.nix
* Link to upstream PRs
* Use --replace-fail
This commit is contained in:
Ben Wolsieffer 2024-07-25 20:36:34 -04:00
parent a55d6a903b
commit a76cac0463
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
distros/distro-overlay.nix
View file

@ -65,15 +65,6 @@ let
image-cb-detector = patchBoostSignals rosSuper.image-cb-detector; image-cb-detector = patchBoostSignals rosSuper.image-cb-detector;
jsk-recognition-msgs = rosSuper.jsk-recognition-msgs.overrideAttrs ({
buildInputs ? [], postPatch ? "", ...
}: {
buildInputs = buildInputs ++ [ rosSuper.ros-environment ];
postPatch = ''
substituteInPlace CMakeLists.txt --replace "catkin_python_setup()" ""
'';
});
laser-cb-detector = patchBoostSignals rosSuper.laser-cb-detector; laser-cb-detector = patchBoostSignals rosSuper.laser-cb-detector;
libfranka = rosSuper.libfranka.overrideAttrs ({ libfranka = rosSuper.libfranka.overrideAttrs ({

13
distros/ros1-overlay.nix
View file

@ -71,6 +71,19 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "0nryr4hg3lha1aaz35wbqr42lb6l8alfcy6slj2yn2dgb5syrmn2"; sha256 = "0nryr4hg3lha1aaz35wbqr42lb6l8alfcy6slj2yn2dgb5syrmn2";
}; };
jsk-recognition-msgs = rosSuper.jsk-recognition-msgs.overrideAttrs ({
buildInputs ? [], postPatch ? "", ...
}: {
# Merged upstream
# https://github.com/jsk-ros-pkg/jsk_recognition/pull/2836
buildInputs = buildInputs ++ [ rosSelf.ros-environment ];
# Part of upstream PR
# https://github.com/jsk-ros-pkg/jsk_recognition/pull/2829
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail "catkin_python_setup()" ""
'';
});
libphidgets = patchVendorUrl rosSuper.libphidgets { libphidgets = patchVendorUrl rosSuper.libphidgets {
url = "https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget/libphidget_2.1.8.20151217.tar.gz"; url = "https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget/libphidget_2.1.8.20151217.tar.gz";
sha256 = "0lpaskqxpklm05050wwvdqwhw30f2hpzss8sgyvczdpvvqzjg4vk"; sha256 = "0lpaskqxpklm05050wwvdqwhw30f2hpzss8sgyvczdpvvqzjg4vk";