From 2b4c4d16a04ca2163a20af434746ad10ea9753f6 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 9 Oct 2025 16:40:32 +0200 Subject: [PATCH] ares: 145 -> 146 --- pkgs/by-name/ar/ares/darwin-build-fixes.patch | 14 +++++++------- pkgs/by-name/ar/ares/package.nix | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch index 96b07f2ee141..4457b36c5e8d 100644 --- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -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 "$" -+ PRIVATE "$" - ) +- target_link_libraries(ruby PRIVATE "$") ++ target_link_libraries(ruby PRIVATE "$") endif() + if(librashader_FOUND) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 39d4bb316fba..31dbaa0fb4ed 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -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 =