From 58cb2114b55a5cb20a4bcbe8b5d13dbd45ff95ba Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Wed, 6 May 2020 00:28:32 -0600
Subject: [PATCH] Use the libstdc++11 libcxx for conan and include libzip in
 the base image

---
 linux-fresh/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile
index 0e811fd..831bd9b 100644
--- a/linux-fresh/Dockerfile
+++ b/linux-fresh/Dockerfile
@@ -5,18 +5,19 @@ RUN useradd -m -s /bin/bash yuzu && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     build-essential \
     libboost-all-dev \
+    liblz4-dev \
     libsdl2-dev \
     libssl-dev \
     libopus-dev \
+    libzip-dev \
     libzstd-dev \
+    zlib1g-dev \
     python \
     python3-pip \
     qtbase5-dev \
     qtbase5-private-dev \
     qtwebengine5-dev \
     libqt5opengl5-dev \
-    liblz4-dev \
-    zlib1g-dev \
     wget \
     git \
     ccache \
@@ -25,6 +26,6 @@ RUN useradd -m -s /bin/bash yuzu && \
     pip3 install conan && \
     apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
 USER yuzu
-RUN conan install catch2/2.11.0@ && \
-    conan install fmt/6.2.0@ && \
-    conan install nlohmann_json/3.7.3@
+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