From e1d1c4acca683b37453fe2b73ab3f630292cfbe8 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Tue, 12 Aug 2025 21:04:46 +0200
Subject: [PATCH] build: Fix vcpkg mess

---
 .github/workflows/build.yml | 2 +-
 dist/macOS/arm64.Dockerfile | 6 +++---
 dist/web/Dockerfile         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1fc16016c..5f212be8a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -241,7 +241,7 @@ jobs:
 
       - name: 📦 Install vcpkg
         uses: friendlyanon/setup-vcpkg@v1
-        with: { committish: ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0 }
+        with: { committish: dd3097e305afa53f7b4312371f62058d2e665320 }
 
       - name: ⬇️ Install dependencies
         run: |
diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile
index eba132074..59e821712 100644
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@@ -53,13 +53,13 @@ RUN --mount=type=cache,target=/var/lib/apt/lists/ apt update && apt install -y l
 # -- DOWNLOADING + BUILDING STUFF
 
 ENV VCPKG_DEFAULT_BINARY_CACHE /cache/vcpkg
-COPY --from=imhex /dist/vcpkg.json /vcpkg.json
-RUN --mount=type=cache,target=/cache <<EOF
+RUN --mount=type=cache,target=/cache \
+    --mount=type=bind,source=.,target=/imhex <<EOF
 ## Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-
+cp /imhex/dist/vcpkg.json .
 vcpkg install --triplet=arm-osx-mytriplet
 EOF
 
diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index 1a8a58c48..a773b1ba5 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -29,13 +29,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 EOF
 
 ENV VCPKG_DEFAULT_BINARY_CACHE=/cache/vcpkg
-COPY --from=imhex /dist/vcpkg.json /vcpkg.json
-RUN --mount=type=cache,target=/cache <<EOF
+RUN --mount=type=cache,target=/cache \
+    --mount=type=bind,source=.,target=/imhex <<EOF
 # Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-
+cp /imhex/dist/vcpkg.json .
 /vcpkg/vcpkg install --triplet=wasm32-emscripten
 
 EOF