suyu/build-environments
26
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mingw: Install pefile through pacman

Browse source 
Recent Arch Linux packaging policy changes require Python modules to
be installed through the package manager, not pip.

pip is still installed for compatibility with existing docker scripts
on yuzu's side.
This commit is contained in:
lat9nq 2023-07-09 16:15:10 -04:00
parent 41caf444bb
commit 1ed95df536
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linux-mingw/Dockerfile
View file

@ -20,6 +20,8 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
wget \ wget \
git \ git \
glslang \ glslang \
# TODO: Remove python-pip after a reasonable amount of time has passed to let yuzu PRs rebase its scripts
python-pefile \
python-pip \ python-pip \
python \ python \
ccache \ ccache \
@ -51,8 +53,6 @@ RUN wget --no-verbose \
pacman -U --noconfirm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \ pacman -U --noconfirm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \
rm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst rm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst
# Setup extra mingw work arounds
RUN pip3 install pefile
# Compatibility with the old Ubuntu MingW image # Compatibility with the old Ubuntu MingW image
RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5 RUN ln -s /usr/x86_64-w64-mingw32/lib/qt /usr/x86_64-w64-mingw32/lib/qt5
# Give yuzu user sudo access for AUR usage # Give yuzu user sudo access for AUR usage