Try to fix rosbag2-bag-v2-plugins

This commit is contained in:
Ben Wolsieffer 2021-07-06 21:24:28 -04:00
parent 97bd4c9cd8
commit d35a4df14c
3 changed files with 26 additions and 0 deletions

View file

@ -249,6 +249,22 @@ let
''; '';
}); });
ros1-rosbag-storage-vendor = rosSuper.ros1-rosbag-storage-vendor.overrideAttrs ({
buildInputs ? [], propagatedBuildInputs ? [], ...
}: with self.rosPackages.noetic; {
# Depends on ROS 1 packages that can't be specified in package.xml
buildInputs = buildInputs ++ [ roscpp ];
# Should be specified as build_export_depend
propagatedBuildInputs = propagatedBuildInputs ++ [ self.bzip2 roslz4 ];
});
rosbag2-bag-v2-plugins = rosSuper.rosbag2-bag-v2-plugins.overrideAttrs ({
buildInputs ? [], ...
}: with self.rosPackages.noetic; {
# Depends on ROS 1 packages that can't be specified in package.xml
buildInputs = buildInputs ++ [ roscpp ];
});
roscpp = patchBoostSignals rosSuper.roscpp; roscpp = patchBoostSignals rosSuper.roscpp;
rmw-implementation = rosSuper.rmw-implementation.overrideAttrs ({ rmw-implementation = rosSuper.rmw-implementation.overrideAttrs ({

View file

@ -14,6 +14,11 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "0v6ks4hpxmakgymcfvafynla76gl3866grgwf4vjdsb4rsvr13vx"; sha256 = "0v6ks4hpxmakgymcfvafynla76gl3866grgwf4vjdsb4rsvr13vx";
}; };
ros1-rosbag-storage-vendor = patchVendorUrl rosSuper.ros1-rosbag-storage-vendor {
url = "https://github.com/ros/ros_comm/archive/669fbd32d2f92cc295f4b024fcb2f982fddec0f0.zip";
sha256 = "0phwk8imiy72xnizqj3y6vn5crjrcpr4qazhphv49r8zprirn6nj";
};
rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor { rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip"; url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";

View file

@ -28,6 +28,11 @@ rosSelf: rosSuper: with rosSelf.lib; {
sha256 = "0145vj9hrhb9qjp6jfvw0d1qc31lbb103xzxscr0yms0asv4sl4p"; sha256 = "0145vj9hrhb9qjp6jfvw0d1qc31lbb103xzxscr0yms0asv4sl4p";
}; };
ros1-rosbag-storage-vendor = patchVendorUrl rosSuper.ros1-rosbag-storage-vendor {
url = "https://github.com/ros/ros_comm/archive/08fcc096f4e822b56bfb5a30b0a09ec45f0802aa.zip";
sha256 = "0av26k0rxvlg839snpcbvdcd0gy6yp6wm74wmvp32n9slfkcvcd7";
};
rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor { rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip"; url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4"; sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";