From e0c2a39ce7c8b20cd216c4030626f9c437fd577c Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sat, 8 Feb 2025 11:27:40 +0100
Subject: [PATCH] build: Fix ARM64 macOS build issues

---
 dist/macOS/arm64.Dockerfile | 10 +++++++++-
 dist/web/Dockerfile         |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile
index c76c3a742..25f1bb74e 100644
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@@ -6,7 +6,15 @@ ENV MACOSX_DEPLOYMENT_TARGET 13.0
 # -- DOWNLOADING STUFF
 
 # Update vcpkg
-RUN git -C /vcpkg pull
+RUN <<EOF
+cp /vcpkg/triplets/community/arm-osx-mytriplet.cmake /tmp/arm-osx-mytriplet.cmake
+git -C /vcpkg clean -ffdx
+git -C /vcpkg checkout origin/master
+git -C /vcpkg reset --hard
+git -C /vcpkg pull
+/vcpkg/bootstrap-vcpkg.sh
+cp /tmp/arm-osx-mytriplet.cmake /vcpkg/triplets/community/arm-osx-mytriplet.cmake
+EOF
 
 ## Install make
 RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y make
diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index 3d9c35357..d1d28a822 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -13,8 +13,8 @@ RUN <<EOF
 set -xe
 
 git clone https://github.com/microsoft/vcpkg /vcpkg
-/vcpkg/bootstrap-vcpkg.sh
 git -C /vcpkg pull
+/vcpkg/bootstrap-vcpkg.sh
 sed -i 's/vcpkg_install_make(${EXTRA_ARGS})/vcpkg_install_make(${EXTRA_ARGS} SUBPATH src)/g' /vcpkg/ports/libmagic/portfile.cmake
 EOF