vcpkg 2024.11.16 & update nixpkgs

melonDS-emu · Nov 23, 2024 · 730b488 · 730b488
1 parent 1d6c902
commit 730b488
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 10b7a178346f3f0abef60cecd5130e295afd8da4
+          vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c
       - name: Build
         uses: lukka/run-cmake@v10
         with:

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Set up vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 10b7a178346f3f0abef60cecd5130e295afd8da4
+        vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c
     - name: Configure
       run: cmake --preset=release-mingw-x86_64 -DMELONDS_EMBED_BUILD_INFO=ON
     - name: Build

diff --git a/cmake/ConfigureVcpkg.cmake b/cmake/ConfigureVcpkg.cmake
@@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
     endif()
     FetchContent_Declare(vcpkg
         GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
-        GIT_TAG 2024.10.21
+        GIT_TAG 2024.11.16
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
     FetchContent_MakeAvailable(vcpkg)
 endif()

diff --git a/flake.lock b/flake.lock