From d8ad23630a811bddaa8f4eb395b73dfb9b21c3b1 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Tue, 12 Aug 2025 23:27:48 +0200
Subject: [PATCH] build: Revert back to old way of installing vcpkg packages

---
 dist/macOS/arm64.Dockerfile | 17 ++++++++++++-----
 dist/vcpkg.json             |  2 +-
 dist/web/Dockerfile         | 13 ++++++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile
index be8028857..86dbfcf92 100644
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@@ -53,15 +53,22 @@ 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
-RUN --mount=type=cache,target=/cache \
-    --mount=type=bind,source=.,target=/imhex <<EOF
+RUN --mount=type=cache,target=/cache <<EOF
 ## Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-cp /imhex/dist/vcpkg.json .
-git -C /vcpkg fetch
-vcpkg install --triplet=arm-osx-mytriplet
+
+vcpkg install --triplet=arm-osx-mytriplet curl
+vcpkg install --triplet=arm-osx-mytriplet mbedtls
+vcpkg install --triplet=arm-osx-mytriplet freetype
+vcpkg install --triplet=arm-osx-mytriplet josuttis-jthread
+vcpkg install --triplet=arm-osx-mytriplet zlib
+vcpkg install --triplet=arm-osx-mytriplet bzip2
+vcpkg install --triplet=arm-osx-mytriplet liblzma
+vcpkg install --triplet=arm-osx-mytriplet zstd
+vcpkg install --triplet=arm-osx-mytriplet openssl
+vcpkg install --triplet=arm-osx-mytriplet libssh2
 EOF
 
 ## Install glfw3 dep
diff --git a/dist/vcpkg.json b/dist/vcpkg.json
index 9fbe96e11..ad3f4be61 100644
--- a/dist/vcpkg.json
+++ b/dist/vcpkg.json
@@ -1,7 +1,7 @@
 {
     "name": "vcpkg",
     "version": "1.0.0",
-    "builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
+    "builtin-baseline": "7e21420f775f72ae938bdeb5e6068f722088f06a",
     "dependencies": [
         "libmagic",
         "freetype",
diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index d8bfd0bea..d5289daa3 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -29,16 +29,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 EOF
 
 ENV VCPKG_DEFAULT_BINARY_CACHE=/cache/vcpkg
-RUN --mount=type=cache,target=/cache \
-    --mount=type=bind,source=.,target=/imhex <<EOF
+RUN --mount=type=cache,target=/cache <<EOF
 # Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-cp /imhex/dist/vcpkg.json .
-git -C /vcpkg pull
-/vcpkg/vcpkg install --triplet=wasm32-emscripten
 
+/vcpkg/vcpkg install --triplet=wasm32-emscripten libmagic
+/vcpkg/vcpkg install --triplet=wasm32-emscripten freetype
+/vcpkg/vcpkg install --triplet=wasm32-emscripten mbedtls
+/vcpkg/vcpkg install --triplet=wasm32-emscripten zlib
+/vcpkg/vcpkg install --triplet=wasm32-emscripten bzip2
+/vcpkg/vcpkg install --triplet=wasm32-emscripten liblzma
+/vcpkg/vcpkg install --triplet=wasm32-emscripten zstd
 EOF
 
 # Build ImHex