diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix index 275c276f0455..ae4e63657fbe 100644 --- a/pkgs/by-name/hy/hypseus-singe/package.nix +++ b/pkgs/by-name/hy/hypseus-singe/package.nix @@ -11,6 +11,7 @@ SDL2, SDL2_image, SDL2_ttf, + SDL2_mixer, libmpeg2, libvorbis, libzip, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hypseus-singe"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "DirtBagXon"; repo = "hypseus-singe"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-04WC0fO/eNUz4muwDAbjDy5AA53QPpX5dq5Xgt8qeBI="; }; patches = [ ./use-shared-mpeg2.patch ]; @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_ttf + SDL2_mixer libmpeg2 libvorbis libzip @@ -55,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL2_image}/include/SDL2" "-I${lib.getDev SDL2_ttf}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" ]; preConfigure = '' diff --git a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch index 3348146e3ddc..f1118d9e45b6 100644 --- a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch +++ b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6a85063..73dbd39 100644 +index 780b802..2f0b489 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -50,13 +50,12 @@ include(GetGitRevisionDescription) +@@ -53,14 +53,13 @@ include(GetGitRevisionDescription) include(InstallRequiredSystemLibraries) include(FindPkgConfig) include(ExternalProject) @@ -12,12 +12,13 @@ index 6a85063..73dbd39 100644 PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) + PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer) -build_libmpeg2( ) +PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") -@@ -110,7 +109,6 @@ add_subdirectory(timer) +@@ -114,7 +113,6 @@ add_subdirectory(timer) add_subdirectory(video) add_subdirectory(vldp)