Skip to content
This repository was archived by the owner on Aug 30, 2025. It is now read-only.

Commit e7b9fb8

Browse files
Update naev-macos Meson source. (The bugfix branch we were using was merged into the main line and deleted.)
1 parent 40f7638 commit e7b9fb8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

naev/naev-macos/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
2626
echo "Verifying pip install" && \
2727
python3 -m pip --version
2828

29-
# Install meson via pip.
29+
# Install a development version of Meson which fixes https://github.com/mesonbuild/meson/issues/8165
3030
WORKDIR /usr/local/src
31-
RUN git clone https://github.com/dcbaker/meson.git -b wip/2021-01/framework-dependency-fix
31+
RUN git clone https://github.com/mesonbuild/meson.git
3232

3333
WORKDIR /usr/local/src/meson
34-
RUN python3 -m pip install . && \
34+
RUN git checkout e6a167ce092a36017a4ff56b3fb045be62377a25 && \
35+
python3 -m pip install . && \
3536
echo "Verifying meson install" && \
3637
which meson && \
3738
meson --version

0 commit comments

Comments
 (0)