pyrox.dev / nixpkgs
lol
fork atom

hypseus-singe: 2.11.3 -> 2.11.4 (#401158)

authored by Toma and committed by GitHub 6f14a180 07c4db35

+10 -6
unified split
+6 -3
pkgs/by-name/hy/hypseus-singe/package.nix
··· 11 SDL2, 12 SDL2_image, 13 SDL2_ttf, 14 libmpeg2, 15 libvorbis, 16 libzip, ··· 19 20 stdenv.mkDerivation (finalAttrs: { 21 pname = "hypseus-singe"; 22 - version = "2.11.3"; 23 24 src = fetchFromGitHub { 25 owner = "DirtBagXon"; 26 repo = "hypseus-singe"; 27 - rev = "refs/tags/v${finalAttrs.version}"; 28 - hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E="; 29 }; 30 31 patches = [ ./use-shared-mpeg2.patch ]; ··· 44 SDL2 45 SDL2_image 46 SDL2_ttf 47 libmpeg2 48 libvorbis 49 libzip ··· 55 env.NIX_CFLAGS_COMPILE = toString [ 56 "-I${lib.getDev SDL2_image}/include/SDL2" 57 "-I${lib.getDev SDL2_ttf}/include/SDL2" 58 ]; 59 60 preConfigure = ''
··· 11 SDL2, 12 SDL2_image, 13 SDL2_ttf, 14 + SDL2_mixer, 15 libmpeg2, 16 libvorbis, 17 libzip, ··· 20 21 stdenv.mkDerivation (finalAttrs: { 22 pname = "hypseus-singe"; 23 + version = "2.11.4"; 24 25 src = fetchFromGitHub { 26 owner = "DirtBagXon"; 27 repo = "hypseus-singe"; 28 + tag = "v${finalAttrs.version}"; 29 + hash = "sha256-04WC0fO/eNUz4muwDAbjDy5AA53QPpX5dq5Xgt8qeBI="; 30 }; 31 32 patches = [ ./use-shared-mpeg2.patch ]; ··· 45 SDL2 46 SDL2_image 47 SDL2_ttf 48 + SDL2_mixer 49 libmpeg2 50 libvorbis 51 libzip ··· 57 env.NIX_CFLAGS_COMPILE = toString [ 58 "-I${lib.getDev SDL2_image}/include/SDL2" 59 "-I${lib.getDev SDL2_ttf}/include/SDL2" 60 + "-I${lib.getDev SDL2_mixer}/include/SDL2" 61 ]; 62 63 preConfigure = ''
+4 -3
pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch
··· 1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 2 - index 6a85063..73dbd39 100644 3 --- a/src/CMakeLists.txt 4 +++ b/src/CMakeLists.txt 5 - @@ -50,13 +50,12 @@ include(GetGitRevisionDescription) 6 include(InstallRequiredSystemLibraries) 7 include(FindPkgConfig) 8 include(ExternalProject) ··· 12 13 PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) 14 PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) 15 -build_libmpeg2( ) 16 +PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) 17 18 message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") 19 20 - @@ -110,7 +109,6 @@ add_subdirectory(timer) 21 add_subdirectory(video) 22 add_subdirectory(vldp) 23
··· 1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 2 + index 780b802..2f0b489 100644 3 --- a/src/CMakeLists.txt 4 +++ b/src/CMakeLists.txt 5 + @@ -53,14 +53,13 @@ include(GetGitRevisionDescription) 6 include(InstallRequiredSystemLibraries) 7 include(FindPkgConfig) 8 include(ExternalProject) ··· 12 13 PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) 14 PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) 15 + PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer) 16 -build_libmpeg2( ) 17 +PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) 18 19 message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") 20 21 + @@ -114,7 +113,6 @@ add_subdirectory(timer) 22 add_subdirectory(video) 23 add_subdirectory(vldp) 24