mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
ares: 145 -> 146 (#450326)
This commit is contained in:
commit
5a3b0dc7ea
|
|
@ -24,15 +24,15 @@ index 3777ac98a..07ff17009 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
|
||||
index 7b594bb4a..18e886fe7 100644
|
||||
--- a/ruby/cmake/os-macos.cmake
|
||||
+++ b/ruby/cmake/os-macos.cmake
|
||||
@@ -43,7 +43,7 @@ target_link_libraries(
|
||||
@@ -41,7 +41,7 @@ target_link_libraries(
|
||||
)
|
||||
|
||||
if(SDL_FOUND)
|
||||
target_link_libraries(
|
||||
ruby
|
||||
- PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
|
||||
+ PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
|
||||
)
|
||||
- target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>")
|
||||
+ target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>")
|
||||
endif()
|
||||
|
||||
if(librashader_FOUND)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
alsa-lib,
|
||||
apple-sdk_14,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
libGL,
|
||||
|
|
@ -29,13 +29,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ares";
|
||||
version = "145";
|
||||
version = "146";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ares-emulator";
|
||||
repo = "ares";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-es+K5+qlK7FcJCFEIMcOsXCZSnoXEEmtS0yhpCvaILM";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz";
|
||||
hash = "sha256-D4N0u9NNlhs4nMoUrAY+sg6Ybt1xQPMiH1u0cV0Qixs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -80,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cmakeFlags = [
|
||||
(lib.cmakeBool "ARES_BUILD_LOCAL" false)
|
||||
(lib.cmakeBool "ARES_SKIP_DEPS" true)
|
||||
(lib.cmakeBool "ARES_BUILD_OFFICIAL" true)
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
|
|
|||
Loading…
Reference in a new issue