From 1ed95df53650c579478c0f13c94c5d37f6790bca Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 9 Jul 2023 16:15:10 -0400 Subject: [PATCH] mingw: Install pefile through pacman 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. --- linux-mingw/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index ab9e7ca..b88fedc 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -20,6 +20,8 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \ wget \ git \ 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 \ ccache \ @@ -51,8 +53,6 @@ RUN wget --no-verbose \ 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 -# Setup extra mingw work arounds -RUN pip3 install pefile # Compatibility with the old Ubuntu MingW image 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