mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-06-11 18:24:50 +03:00

This catches when packages update their vendored version but we haven't updated on our end. Try to fix all usages of patchExternalProjectGit so they are correct now.
144 lines
4.8 KiB
Nix
144 lines
4.8 KiB
Nix
# Top level package set
|
|
self:
|
|
# Distro package set
|
|
rosSelf: rosSuper: with rosSelf.lib; {
|
|
cyclonedds = rosSuper.cyclonedds.overrideAttrs ({
|
|
preConfigure ? "", ...
|
|
}: {
|
|
# Fix running ddsconf from within the build directory (probably an RPATH
|
|
# issue)
|
|
preConfigure = preConfigure + ''
|
|
export LD_LIBRARY_PATH="$(pwd)/build/lib"
|
|
'';
|
|
});
|
|
|
|
gazebo = self.gazebo_11;
|
|
|
|
libphidget22 = patchVendorUrl rosSuper.libphidget22 {
|
|
url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-1.7.20210816.tar.gz";
|
|
sha256 = "sha256-00FyzWdp4hi6aYUNcn1326ddDftYowB803cMII7h3no=";
|
|
};
|
|
|
|
libyaml-vendor = patchVendorUrl rosSuper.libyaml-vendor {
|
|
url = "https://github.com/yaml/libyaml/archive/10c907871f1ccd779c7fccf6b81a62762b5c4e7b.zip";
|
|
sha256 = "0v6ks4hpxmakgymcfvafynla76gl3866grgwf4vjdsb4rsvr13vx";
|
|
};
|
|
|
|
mcap-vendor = patchExternalProjectGit (patchExternalProjectGit rosSuper.mcap-vendor {
|
|
url = "https://github.com/foxglove/mcap.git";
|
|
rev = "dc6561d9ba867901709e36526dcf7f7359861e9c";
|
|
fetchgitArgs.hash = "sha256-cWBZgCgxssM3xZZPbZlU1yYlZUD7KJ/wiYSgPXNjwzU=";
|
|
}) {
|
|
url = "https://github.com/lz4/lz4.git";
|
|
fetchgitArgs = {
|
|
rev = "d44371841a2f1728a3f36839fd4b7e872d0927d3";
|
|
hash = "sha256-f7GZgOzUrkAfw1mqwlIKQQqDvkvIahGlHvq6AL+aAvA=";
|
|
};
|
|
};
|
|
|
|
pendulum-control = rosSuper.pendulum-control.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = patches ++ [
|
|
# Remove the malloc_hook from the pendulum_demo (for glibc 2.34).
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros2/demos/commit/754612348e408675f526174c5f03786e08ad8a70.patch";
|
|
hash = "sha256-B+UW1OL0SOs7mOEOtpu5CSo8zSk5ifJdwC/deY/7zTg=";
|
|
stripLen = 1;
|
|
})
|
|
];
|
|
});
|
|
|
|
python-qt-binding = rosSuper.python-qt-binding.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = [
|
|
# Fix finding PyQt5 SIP bindings with SIP >=5
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros-visualization/python_qt_binding/commit/d97ecb27e4460633f97b816e3217b032a93c5da0.patch";
|
|
sha256 = "08sdsm879bq349kq2k3wbs7p3l2syzrxdw3cgdvxfj2inkhdbf9f";
|
|
})
|
|
] ++ patches;
|
|
});
|
|
|
|
rmw-cyclonedds-cpp = rosSuper.rmw-cyclonedds-cpp.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = patches ++ [
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros2/rmw_cyclonedds/commit/f57732d15be53796d518e12352866124efcaa939.patch";
|
|
hash = "sha256-hfvYAAmRYKPkwHCnZTy8tudSPXRlhuQmaujs4cy0fCE=";
|
|
stripLen = 1;
|
|
})
|
|
];
|
|
});
|
|
|
|
ros2cli = rosSuper.ros2cli.overrideAttrs ({
|
|
propagatedBuildInputs ? [], ...
|
|
}: {
|
|
propagatedBuildInputs = propagatedBuildInputs ++ [
|
|
# Add argcomplete as a propagated ros2cli dependency.
|
|
# https://github.com/ros2/ros2cli/pull/564
|
|
# https://github.com/ros2/ros2cli/blob/26715cbb0948258d6f04b94c909d035c5130456a/ros2cli/ros2cli/cli.py#L45
|
|
rosSelf.python3Packages.argcomplete
|
|
];
|
|
});
|
|
|
|
rosidl-generator-py = rosSuper.rosidl-generator-py.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = patches ++ [
|
|
# Remove stray numpy import in template
|
|
# https://github.com/ros2/rosidl_python/pull/185
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros2/rosidl_python/commit/bf866089baeb918834d9d16e05668d9f28887b87.patch";
|
|
hash = "sha256-tOb0t50TbV29+agDupm5XUZJJErfaujgIRtmb2vZxWo=";
|
|
stripLen = 1;
|
|
})
|
|
];
|
|
});
|
|
|
|
rviz-ogre-vendor = (patchVendorUrl rosSuper.rviz-ogre-vendor {
|
|
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
|
|
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
|
|
}).overrideAttrs ({ patches ? [], preFixup ? "", ... }: {
|
|
patches = patches ++ [
|
|
# Fix AArch64 builds.
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros2/rviz/pull/828.patch";
|
|
hash = "sha256-KpY9+oOsFxH+zhIxyP6UTOXTLaaUdCRzUMZnM7+uRAk=";
|
|
stripLen = 1;
|
|
})
|
|
];
|
|
|
|
preFixup = ''
|
|
# Prevent /build RPATH references
|
|
rm -r ogre_install
|
|
'' + preFixup;
|
|
});
|
|
|
|
urdfdom = rosSuper.urdfdom.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = patches ++ [
|
|
# Fix CMake relative install dir assumptions
|
|
# https://github.com/ros/urdfdom/pull/142 (backported to 2.3)
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros/urdfdom/commit/f6d9b2e248ab5c7d08b21a104a2d2d7fa3490790.patch";
|
|
hash = "sha256-ykBw9DEBraYHzgrCa1JkDhWTYXBQL1MmfelC5j5ibrs=";
|
|
})
|
|
];
|
|
});
|
|
|
|
yaml-cpp-vendor = rosSuper.yaml-cpp-vendor.overrideAttrs ({
|
|
patches ? [], ...
|
|
}: {
|
|
patches = [
|
|
# Fix "CMake Error: Unknown argument -std=c++14 -w"
|
|
(self.fetchpatch {
|
|
url = "https://github.com/ros2/yaml_cpp_vendor/pull/24.patch";
|
|
sha256 = "0via2vcvx0r0w8n626n7ghljadd2apdqn0wcqygmgbd7dmvfr97h";
|
|
})
|
|
] ++ patches;
|
|
});
|
|
}
|