mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-07-13 21:50:38 +03:00
- fix librealsense2 build (squash commits)
This commit is contained in:
parent
f92010d437
commit
1f4b95fc0e
1 changed files with 15 additions and 0 deletions
|
@ -72,6 +72,21 @@ rosSelf: rosSuper: with rosSelf.lib; {
|
||||||
cmakeFlags = cmakeFlags ++ [ "-DDOWNLOAD_TOML_LIB=OFF" ];
|
cmakeFlags = cmakeFlags ++ [ "-DDOWNLOAD_TOML_LIB=OFF" ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
librealsense2 = rosSuper.librealsense2.overrideAttrs ({
|
||||||
|
buildInputs, postPatch ? "", version, ...
|
||||||
|
}: {
|
||||||
|
buildInputs = buildInputs ++
|
||||||
|
(if version >= "2.55.1" then
|
||||||
|
[ self.nlohmann_json ]
|
||||||
|
else []);
|
||||||
|
postPatch = postPatch +
|
||||||
|
(if version >= "2.55.1" then
|
||||||
|
''
|
||||||
|
substituteInPlace third-party/CMakeLists.txt --replace-fail 'include(CMake/external_json.cmake)' ""
|
||||||
|
''
|
||||||
|
else "");
|
||||||
|
});
|
||||||
|
|
||||||
popf = rosSuper.popf.overrideAttrs ({
|
popf = rosSuper.popf.overrideAttrs ({
|
||||||
nativeBuildInputs ? [], postPatch ? "", ...
|
nativeBuildInputs ? [], postPatch ? "", ...
|
||||||
}: {
|
}: {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue