Skip to content

Update to msys2-hacks-22 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lazka merged 1 commit into from
Mar 22, 2026
Merged

Update to msys2-hacks-22 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ RUN apt update && \
# Build and install patched WINE (see https://github.com/msys2/MSYS2-packages/issues/682)
RUN git clone --filter=tree:0 https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc && \
cd /tmp/winesrc && \
# https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-21
git checkout 8ea3a1155e80d004aeeb5651f51e07d96a37a78c && \
# https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-22
git checkout 2aa524aec434517843ffa1d52ad1982f86fdd074 && \
./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386 && \
make -j $(nproc) && \
env DESTDIR=/wine make -j $(nproc) install && \
Expand Down
5 changes: 4 additions & 1 deletion msys2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ RUN apt update \
COPY --from=build /wine /
RUN ldconfig

# Avoid "tzset" startup warning + and wineboot crashing
ENV TZ=UTC

# XXX: otherwise things hang
RUN winecfg
RUN WINEDEBUG=-all wineboot --init

# Copy over MSYS2
COPY --from=build /tmp/msys64 /root/.wine/drive_c/msys64
Expand Down
Loading