Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
iTrooz 2023-10-10 16:58:43 +02:00 committed by GitHub
parent c7c05e2621
commit 7b22c49329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/web/Dockerfile vendored
View File

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