From 7b22c49329b7e24c9cfac28c2227413e418d49e5 Mon Sep 17 00:00:00 2001
From: iTrooz <hey@itrooz.fr>
Date: Tue, 10 Oct 2023 16:58:43 +0200
Subject: [PATCH] build: Integrate my libmagic patch into the Dockerfile rather
 than my vcpkg fork (#1359)

This PR integrates my libmagic patch into the Dockerfile rather than my
vcpkg fork (so we can use the official vcpkg repository in the future)
That said, we still use my vcpkg fork for now because official vcpkg
fails to compile freetype
---
 dist/web/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dist/web/Dockerfile b/dist/web/Dockerfile
index 3b2aa9103..ef8849f61 100644
--- a/dist/web/Dockerfile
+++ b/dist/web/Dockerfile
@@ -7,10 +7,15 @@ ARG UNIQUEKEY 1
 RUN apt update
 RUN apt install -y git ccache autoconf automake libtool cmake pkg-config
 
+RUN <<EOF
 # Install vcpkg
 # Note: we are using my fork of the repository with a libmagic patch
-RUN git clone https://github.com/iTrooz/vcpkg --branch libmagic /vcpkg
-RUN /vcpkg/bootstrap-vcpkg.sh
+set -xe
+
+git clone https://github.com/iTrooz/vcpkg /vcpkg
+/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
 
 # Patch vcpkg build instructions to add -pthread
 RUN <<EOF