From 43da36a957f15ed3bc498d373c04334ac7c96858 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 11 Aug 2025 17:44:20 +0200
Subject: [PATCH] build: Use vcpkg manifest instead of manually installing deps

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

diff --git a/dist/macOS/arm64.Dockerfile b/dist/macOS/arm64.Dockerfile
index 86dbfcf92..eba132074 100644
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@@ -53,22 +53,14 @@ 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
 ## Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
 
-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
+vcpkg install --triplet=arm-osx-mytriplet
 EOF
 
 ## Install glfw3 dep
diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index d5289daa3..1a8a58c48 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -29,19 +29,15 @@ 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
 # Install dependencies with vcpkg
 set -xe
 
 mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
 
-/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
+/vcpkg/vcpkg install --triplet=wasm32-emscripten
+
 EOF
 
 # Build ImHex