pyrox.dev
ares: 143 -> 144
+24
-11
pkgs/by-name/ar/ares/darwin-build-fixes.patch
+24
-11
pkgs/by-name/ar/ares/darwin-build-fixes.patch
···
1
diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake
2
-
index 99272c662..50f94db37 100644
3
--- a/cmake/macos/compilerconfig.cmake
4
+++ b/cmake/macos/compilerconfig.cmake
5
-
@@ -27,7 +27,7 @@ message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}")
6
-
string(REGEX MATCH ".+/SDKs/MacOSX([0-9]+\\.[0-9])+\\.sdk$" _ ${CMAKE_OSX_SYSROOT})
7
-
set(_ares_macos_current_sdk ${CMAKE_MATCH_1})
8
-
message(DEBUG "macOS SDK version: ${_ares_macos_current_sdk}")
9
-
-if(_ares_macos_current_sdk VERSION_LESS _ares_macos_minimum_sdk)
10
-
+if(FALSE)
11
-
message(
12
-
FATAL_ERROR
13
-
"Your macOS SDK version (${_ares_macos_current_sdk}) is too low. "
14
diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake
15
-
index 864a629f0..f455345bf 100644
16
--- a/cmake/macos/helpers.cmake
17
+++ b/cmake/macos/helpers.cmake
18
@@ -35,7 +35,6 @@ function(ares_configure_executable target)
···
23
24
install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
25
endif()
···
1
diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake
2
+
index f0c900f28..4da64f0b3 100644
3
--- a/cmake/macos/compilerconfig.cmake
4
+++ b/cmake/macos/compilerconfig.cmake
5
+
@@ -25,7 +25,7 @@ function(check_sdk_requirements)
6
+
set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK
7
+
set(ares_macos_minimum_xcode 12.4) # Sync with SDK
8
+
execute_process(
9
+
- COMMAND xcrun --sdk macosx --show-sdk-platform-version
10
+
+ COMMAND echo @sdkVersion@
11
+
OUTPUT_VARIABLE ares_macos_current_sdk
12
+
RESULT_VARIABLE result
13
+
OUTPUT_STRIP_TRAILING_WHITESPACE
14
diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake
15
+
index 3777ac98a..07ff17009 100644
16
--- a/cmake/macos/helpers.cmake
17
+++ b/cmake/macos/helpers.cmake
18
@@ -35,7 +35,6 @@ function(ares_configure_executable target)
···
23
24
install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
25
endif()
26
+
diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
27
+
index 39c339428..dafb58c66 100644
28
+
--- a/ruby/cmake/os-macos.cmake
29
+
+++ b/ruby/cmake/os-macos.cmake
30
+
@@ -43,7 +43,7 @@ target_link_libraries(
31
+
if(SDL_FOUND)
32
+
target_link_libraries(
33
+
ruby
34
+
- PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
35
+
+ PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
36
+
)
37
+
endif()
38
+
+8
-5
pkgs/by-name/ar/ares/package.nix
+8
-5
pkgs/by-name/ar/ares/package.nix
···
1
{
2
lib,
3
-
SDL2,
4
alsa-lib,
5
apple-sdk_14,
6
cmake,
···
19
moltenvk,
20
openal,
21
pkg-config,
22
stdenv,
23
udev,
24
vulkan-loader,
···
28
29
stdenv.mkDerivation (finalAttrs: {
30
pname = "ares";
31
-
version = "143";
32
33
src = fetchFromGitHub {
34
owner = "ares-emulator";
35
repo = "ares";
36
tag = "v${finalAttrs.version}";
37
-
hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8=";
38
};
39
40
nativeBuildInputs =
···
49
50
buildInputs =
51
[
52
-
SDL2
53
libao
54
librashader
55
vulkan-loader
···
73
];
74
75
patches = [
76
-
./darwin-build-fixes.patch
77
];
78
79
cmakeFlags = [
···
1
{
2
lib,
3
alsa-lib,
4
apple-sdk_14,
5
cmake,
···
18
moltenvk,
19
openal,
20
pkg-config,
21
+
replaceVars,
22
+
sdl3,
23
stdenv,
24
udev,
25
vulkan-loader,
···
29
30
stdenv.mkDerivation (finalAttrs: {
31
pname = "ares";
32
+
version = "144";
33
34
src = fetchFromGitHub {
35
owner = "ares-emulator";
36
repo = "ares";
37
tag = "v${finalAttrs.version}";
38
+
hash = "sha256-BpVyPdtsIUstLVf/HGO6vcAlLgJP5SgJbZtqEV/uJ2g=";
39
};
40
41
nativeBuildInputs =
···
50
51
buildInputs =
52
[
53
+
sdl3
54
libao
55
librashader
56
vulkan-loader
···
74
];
75
76
patches = [
77
+
(replaceVars ./darwin-build-fixes.patch {
78
+
sdkVersion = apple-sdk_14.version;
79
+
})
80
];
81
82
cmakeFlags = [