ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update vcpkg and nixpkgs

This commit is contained in:
Nadia Holmquist Pedersen 2024-09-06 13:39:42 +02:00
parent 4f6498c99c
commit 277b151ada
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-macos.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1 vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
- name: Build - name: Build
uses: lukka/run-cmake@v10 uses: lukka/run-cmake@v10
with: with:

4
.github/workflows/build-windows.yml vendored
View File

@ -4,7 +4,7 @@ on:
push: push:
branches: branches:
- master - master
- ci/vcpkg-update - ci/*
pull_request: pull_request:
branches: branches:
- master - master
@ -27,7 +27,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1 vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
- name: Configure - name: Configure
run: cmake --preset=release-mingw-x86_64 run: cmake --preset=release-mingw-x86_64
- 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.07.12 GIT_TAG 2024.08.23
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg") SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg) FetchContent_MakeAvailable(vcpkg)
endif() endif()

6
flake.lock
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723175592, "lastModified": 1725432240,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github" "type": "github"
}, },
"original": { "original": {