Merge remote-tracking branch 'mixxxdj/2.4' into 2.4-rel

daschuer · Jul 26, 2023 · 569c3c7 · 569c3c7
2 parents 8b09457 + cf9ad27
commit 569c3c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
     env:
       VCPKG_PACKAGES: >-
         ableton
+        benchmark
         chromaprint
         fdk-aac
         ffmpeg

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -131,7 +131,9 @@ function(vcpkg_find_acquire_program program)
         set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}")
         set(brew_package_name "nasm")
         set(apt_package_name "nasm")
-        set(download_urls "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip")
+        set(download_urls
+            "https://github.com/microsoft/vcpkg/files/12073957/nasm-${program_version}-win64.zip"
+            "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip")
         set(download_filename "nasm-${program_version}-win64.zip")
         set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062)
     elseif(program STREQUAL "YASM")