From 36b954221ee8c6b0108a7a81d8a1f5e9d0743766 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 28 Mar 2025 13:18:38 -0500
Subject: [PATCH] Install nlohmann-json for Zenoh on Kilted and newer

---
 linux_docker_resources/Dockerfile      | 1 +
 linux_docker_resources/Dockerfile-RHEL | 1 +
 2 files changed, 2 insertions(+)

diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile
index 972c929a..b4961356 100644
--- a/linux_docker_resources/Dockerfile
+++ b/linux_docker_resources/Dockerfile
@@ -72,6 +72,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   libyaml-cpp-dev \
   libyaml-dev \
   libzstd-dev \
+  $(if test ${ROS_DISTRO} != humble -a ${ROS_DISTRO} != jazzy; then echo nlohmann-json3-dev; fi) \
   pybind11-dev \
   pydocstyle \
   python3-argcomplete \
diff --git a/linux_docker_resources/Dockerfile-RHEL b/linux_docker_resources/Dockerfile-RHEL
index 51249683..b279a74b 100644
--- a/linux_docker_resources/Dockerfile-RHEL
+++ b/linux_docker_resources/Dockerfile-RHEL
@@ -108,6 +108,7 @@ RUN dnf install \
     lz4-devel \
     mesa-libGL-devel \
     mesa-libGLU-devel \
+    $(if test ${ROS_DISTRO} != humble -a ${ROS_DISTRO} != jazzy; then echo json-devel; fi) \
     opencv-devel \
     openssl \
     openssl-devel \