mirrors-yuzu-emu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments synced 2024-11-25 15:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

linux-mingw: Remove Conan packages

Browse source 
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.
This commit is contained in:
lat9nq 2021-05-30 21:20:21 -04:00
parent 8507fa7caf
commit af5acc630c
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