From af5acc630c03ecfc9d79c22aca3e466ca17c6e56 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 30 May 2021 21:20:21 -0400 Subject: [PATCH] linux-mingw: Remove Conan packages This opts to not install the yuzu dependencies from Conan, since this happens again at build time regardless of installing them here. Also prevents removing the /tmp directory, to not break building packages later. --- linux-mingw/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index 4640ddb..0a3788c 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -39,7 +39,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ mingw-w64-zstd \ && \ pacman -Scc --noconfirm && \ - rm -rf /usr/share/man/ /tmp/ /var/tmp/ + rm -rf /usr/share/man/ /tmp/* /var/tmp/ # Setup extra mingw work arounds RUN pip3 install pefile @@ -51,7 +51,3 @@ RUN pip3 install conan COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/ COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml USER 1027 -# Install/build the missing libs (uses the default mingw cross compile profile) -RUN conan install catch2/2.13.1@ --build=missing && \ - conan install fmt/7.0.3@ --build=missing && \ - conan install nlohmann_json/3.9.1@ --build=missing