From 65b98e0d38fcb65ddfa8a09f55338d9a7281e754 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 6 Apr 2025 20:55:14 +0200 Subject: [PATCH] make zstd prefer system libs too --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 2 +- external/solanaceae_object_store | 2 +- flake.nix | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ecb07fb..4eb7e13 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -167,7 +167,7 @@ jobs: - name: Install Dependencies env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static zstd:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static # setup vs env - uses: ilammy/msvc-dev-cmd@v1 @@ -235,7 +235,7 @@ jobs: - name: Install Dependencies env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static zstd:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static # setup vs env diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 783ad47..87f4e16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,7 +153,7 @@ jobs: - name: Install Dependencies env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static + run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static zstd:x64-windows-static libwebp:x64-windows-static libpng:x64-windows-static libjpeg-turbo:x64-windows-static freetype:x64-windows-static # setup vs env - uses: ilammy/msvc-dev-cmd@v1 diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store index 2d5478c..738e1a2 160000 --- a/external/solanaceae_object_store +++ b/external/solanaceae_object_store @@ -1 +1 @@ -Subproject commit 2d5478c19ec16d6bf51b0d23993ef4aa9b26dfb5 +Subproject commit 738e1a2071b95000bbed64e2262261cfbdc7dbab diff --git a/flake.nix b/flake.nix index 76b0867..b187a5f 100644 --- a/flake.nix +++ b/flake.nix @@ -90,6 +90,8 @@ libopus libvpx + zstd + libwebp freetype @@ -105,7 +107,6 @@ # TODO: use package instead "-DFETCHCONTENT_SOURCE_DIR_JSON=${nlohmann-json}" # we care about the version - "-DFETCHCONTENT_SOURCE_DIR_ZSTD=${pkgs.zstd.src}" # we dont care about the version (we use 1.4.x features) "-DFETCHCONTENT_SOURCE_DIR_SDL3=${sdl3}" #"-DFETCHCONTENT_SOURCE_DIR_LIBWEBP=${pkgs.libwebp.src}" "-DTOMATO_DEP_LIBWEBP_USE_SYSTEM=ON"