yuzu-emu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2024-11-22 11:35:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from lat9nq/update-mingw

Browse Source 
linux-mingw: Remove Conan packages
This commit is contained in:
bunnei 2021-05-30 22:35:08 -07:00 committed by GitHub
commit ab2973726e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-mingw/Dockerfile
View File

@ -39,7 +39,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
mingw-w64-zstd \ mingw-w64-zstd \
&& \ && \
pacman -Scc --noconfirm && \ pacman -Scc --noconfirm && \
rm -rf /usr/share/man/ /tmp/ /var/tmp/ rm -rf /usr/share/man/ /tmp/* /var/tmp/
# Setup extra mingw work arounds # Setup extra mingw work arounds
RUN pip3 install pefile 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 default /home/yuzu/.conan/profiles/
COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml COPY --chown=yuzu:yuzu settings.yml /home/yuzu/.conan/settings.yml
USER 1027 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