From 8bd98eeca1402306c3d7a8e020148891bb0a8d57 Mon Sep 17 00:00:00 2001
From: Markus Wick <markus@selfnet.de>
Date: Sat, 9 May 2020 12:56:52 +0200
Subject: [PATCH] Use nlohmann json from ubuntu and avoid boost-all.

Also pick boost-context for some upcoming pull request.
---
 linux-fresh/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index 3894eec..b457353 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -5,20 +5,22 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
     DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y full-upgrade && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     build-essential \
-    libboost-all-dev \
+    libboost-dev \
+    libboost-context-dev \
     liblz4-dev \
+    libopus-dev \
+    libqt5opengl5-dev \
     libsdl2-dev \
     libssl-dev \
-    libopus-dev \
     libzip-dev \
     libzstd-dev \
-    zlib1g-dev \
+    nlohmann-json3-dev \
     python \
     python3-pip \
     qtbase5-dev \
     qtbase5-private-dev \
     qtwebengine5-dev \
-    libqt5opengl5-dev \
+    zlib1g-dev \
     wget \
     git \
     ccache \
@@ -28,5 +30,4 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
     apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
 USER 1027
 RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
-    conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
-    conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing
+    conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing