diff --git a/pkgs/by-name/sr/srb2/cmake.patch b/pkgs/by-name/sr/srb2/cmake.patch index 91af532e86fb..077bfb661253 100644 --- a/pkgs/by-name/sr/srb2/cmake.patch +++ b/pkgs/by-name/sr/srb2/cmake.patch @@ -1,56 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 80a3bdcd6..380a1573a 100644 +index a4c631102..13b5743ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -61,7 +61,7 @@ option( - "Link dependencies using CMake's find_package and do not use internal builds" - ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} - ) --option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) -+option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) - # This option isn't recommended for distribution builds and probably won't work (yet). - cmake_dependent_option( - SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES -@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) - option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) - set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") - --if(SRB2_CONFIG_ENABLE_TESTS) -- # https://github.com/catchorg/Catch2 -- CPMAddPackage( -- NAME Catch2 -- VERSION 3.4.0 -- GITHUB_REPOSITORY catchorg/Catch2 -- OPTIONS -- "CATCH_INSTALL_DOCS OFF" -- ) -- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") -- include(CTest) -- include(Catch) -- add_executable(srb2tests) -- # To add tests, use target_sources to add individual test files to the target in subdirs. -- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) -- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) -- catch_discover_tests(srb2tests) --endif() -- - # Enable CCache - # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) - if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) -@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) - message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") - endif() - endif() --else() -- CPMAddPackage( -- NAME Ccache.cmake -- GITHUB_REPOSITORY TheLartians/Ccache.cmake -- VERSION 1.2 -- ) - endif() - - # Dependencies -@@ -179,7 +154,7 @@ include(GitUtilities) +@@ -141,7 +141,7 @@ include(GitUtilities) if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") # cause a reconfigure if the branch changes get_git_dir(SRB2_GIT_DIR) diff --git a/pkgs/by-name/sr/srb2/package.nix b/pkgs/by-name/sr/srb2/package.nix index 70b606d782c9..4d02b4addc95 100644 --- a/pkgs/by-name/sr/srb2/package.nix +++ b/pkgs/by-name/sr/srb2/package.nix @@ -7,8 +7,8 @@ curl, nasm, libopenmpt, + miniupnpc, game-music-emu, - libGLU, libpng, SDL2, SDL2_mixer, @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "srb2"; - version = "2.2.13"; + version = "2.2.15"; src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; rev = "SRB2_release_${finalAttrs.version}"; - hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8="; + hash = "sha256-eJ0GYe3Rw6qQXj+jtyt8MkP87DaCiO9ffChg+SpQqaI="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { game-music-emu libpng libopenmpt + miniupnpc SDL2 SDL2_mixer zlib @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchgit { url = "https://git.do.srb2.org/STJr/srb2assets-public"; rev = "SRB2_release_${finalAttrs.version}"; - hash = "sha256-OXvO5ZlujIYmYevc62Dtx192dxoujQMNFUCrH5quBBg="; + hash = "sha256-1kwhWHzL2TbSx1rhFExbMhXqn0HMBRhR6LZiuoRx+iI="; fetchLFS = true; }; @@ -76,17 +77,9 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Make the build work without internet connectivity - # See: https://build.opensuse.org/request/show/1109889 ./cmake.patch - ./thirdparty.patch ]; - postPatch = '' - substituteInPlace ./src/sdl/ogl_sdl.c \ - --replace libGLU.so.1 ${libGLU}/lib/libGLU.so.1 - ''; - desktopItems = [ (makeDesktopItem rec { name = "Sonic Robo Blast 2"; diff --git a/pkgs/by-name/sr/srb2/thirdparty.patch b/pkgs/by-name/sr/srb2/thirdparty.patch deleted file mode 100644 index bb550290d85d..000000000000 --- a/pkgs/by-name/sr/srb2/thirdparty.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index f33b3bf3f..1214f179c 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") - include("cpm-png.cmake") - include("cpm-curl.cmake") - include("cpm-openmpt.cmake") -+ include("cpm-libgme.cmake") - endif() -- --include("cpm-libgme.cmake")