niansa-misc/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-03-06 21:00:31 +01:00
Code Wiki Activity

vcpkg 2025.01.13, update nixpkgs

Browse source
This commit is contained in:
Nadia Holmquist Pedersen 2025-02-10 20:57:43 +01:00
parent 15c3faa26e
commit e8265df4bd
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build-macos.yml vendored
View file

@ -10,6 +10,7 @@ on:
- master - master
env: env:
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
MELONDS_GIT_BRANCH: ${{ github.ref }} MELONDS_GIT_BRANCH: ${{ github.ref }}
MELONDS_GIT_HASH: ${{ github.sha }} MELONDS_GIT_HASH: ${{ github.sha }}
MELONDS_BUILD_PROVIDER: GitHub Actions MELONDS_BUILD_PROVIDER: GitHub Actions
@ -34,7 +35,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
- name: Build - name: Build
uses: lukka/run-cmake@v10 uses: lukka/run-cmake@v10
with: with:

3
.github/workflows/build-windows.yml vendored
View file

@ -10,6 +10,7 @@ on:
- master - master
env: env:
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
MELONDS_GIT_BRANCH: ${{ github.ref }} MELONDS_GIT_BRANCH: ${{ github.ref }}
MELONDS_GIT_HASH: ${{ github.sha }} MELONDS_GIT_HASH: ${{ github.sha }}
MELONDS_BUILD_PROVIDER: GitHub Actions MELONDS_BUILD_PROVIDER: GitHub Actions
@ -33,7 +34,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
- name: Configure - name: Configure
run: cmake --preset=release-mingw-x86_64 -DMELONDS_EMBED_BUILD_INFO=ON run: cmake --preset=release-mingw-x86_64 -DMELONDS_EMBED_BUILD_INFO=ON
- name: Build - name: Build

2
cmake/ConfigureVcpkg.cmake
View file

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

6
flake.lock generated
View file

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1739020877,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"type": "github" "type": "github"
}, },
"original": { "original": {