diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch index e0fe64bc94da..96b07f2ee141 100644 --- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -1,18 +1,18 @@ diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake -index 99272c662..50f94db37 100644 +index f0c900f28..4da64f0b3 100644 --- a/cmake/macos/compilerconfig.cmake +++ b/cmake/macos/compilerconfig.cmake -@@ -27,7 +27,7 @@ message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}") - string(REGEX MATCH ".+/SDKs/MacOSX([0-9]+\\.[0-9])+\\.sdk$" _ ${CMAKE_OSX_SYSROOT}) - set(_ares_macos_current_sdk ${CMAKE_MATCH_1}) - message(DEBUG "macOS SDK version: ${_ares_macos_current_sdk}") --if(_ares_macos_current_sdk VERSION_LESS _ares_macos_minimum_sdk) -+if(FALSE) - message( - FATAL_ERROR - "Your macOS SDK version (${_ares_macos_current_sdk}) is too low. " +@@ -25,7 +25,7 @@ function(check_sdk_requirements) + set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK + set(ares_macos_minimum_xcode 12.4) # Sync with SDK + execute_process( +- COMMAND xcrun --sdk macosx --show-sdk-platform-version ++ COMMAND echo @sdkVersion@ + OUTPUT_VARIABLE ares_macos_current_sdk + RESULT_VARIABLE result + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake -index 864a629f0..f455345bf 100644 +index 3777ac98a..07ff17009 100644 --- a/cmake/macos/helpers.cmake +++ b/cmake/macos/helpers.cmake @@ -35,7 +35,6 @@ function(ares_configure_executable target) @@ -23,3 +23,16 @@ index 864a629f0..f455345bf 100644 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application) endif() +diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake +index 39c339428..dafb58c66 100644 +--- a/ruby/cmake/os-macos.cmake ++++ b/ruby/cmake/os-macos.cmake +@@ -43,7 +43,7 @@ target_link_libraries( + if(SDL_FOUND) + target_link_libraries( + ruby +- PRIVATE "$" ++ PRIVATE "$" + ) + endif() + diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index e917588264c8..84eaaf6f3d49 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -1,6 +1,5 @@ { lib, - SDL2, alsa-lib, apple-sdk_14, cmake, @@ -19,6 +18,8 @@ moltenvk, openal, pkg-config, + replaceVars, + sdl3, stdenv, udev, vulkan-loader, @@ -28,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "143"; + version = "144"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; tag = "v${finalAttrs.version}"; - hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8="; + hash = "sha256-BpVyPdtsIUstLVf/HGO6vcAlLgJP5SgJbZtqEV/uJ2g="; }; nativeBuildInputs = @@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - SDL2 + sdl3 libao librashader vulkan-loader @@ -73,7 +74,9 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./darwin-build-fixes.patch + (replaceVars ./darwin-build-fixes.patch { + sdkVersion = apple-sdk_14.version; + }) ]; cmakeFlags = [