diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2024-04-03 14:49:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 14:49:27 +0200 |
| commit | 6e26559cd2a225437072a67b4a55f7fd5831057d (patch) | |
| tree | 82654d78839c1ac0eaf4627e745252007ca13627 | |
| parent | 31a7f53282040c7df93204d647de470390b96c4b (diff) | |
ci: fix macOS build
GitHub Actions' macOS runners have Python from homebrew installed and it's used by default instead of the Python that ships with macOS. Apparently Homebrew decided you shouldn't be able to install stuff with `pip3` anymore so our build broke since `setuptools` is no longer included by default and `glib` from vcpkg needs it to build.
Additionally,, the whole liblzma mess ended up breaking our builds too because libarchive (and its dependency libxml2) depends on it and the download is no longer available. The build option changes here should be reverted once this is sorted out because this is probably partially breaking archive support.
PS: Fuck you Jia Tan.
| -rw-r--r-- | .github/workflows/build-macos.yml | 2 | ||||
| -rw-r--r-- | vcpkg.json | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 1d4b917..4178157 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v3 - name: Install dependencies for package building run: | - brew install autoconf automake autoconf-archive libtool && pip3 install setuptools + brew install autoconf automake autoconf-archive libtool python-setuptools - name: Set up CMake uses: lukka/get-cmake@latest - name: Set up vcpkg @@ -1,7 +1,11 @@ { "dependencies": [ "sdl2", - "libarchive", + { + "name": "libarchive", + "default-features": false, + "features": ["bzip2", "crypto", "lz4", "zstd"] + }, "libslirp", "zstd", { |