superTuxKart: 1.2 -> 1.3

OPNA2608 23dab135 781972b2

+25 -29
+25 -29
pkgs/games/super-tux-kart/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , fetchsvn 6 5 , cmake 7 6 , pkg-config ··· 20 19 , mcpp 21 20 , wiiuse 22 21 , angelscript 22 + , libopenglrecorder 23 + , sqlite 23 24 , Cocoa 24 25 , IOKit 26 + , libsamplerate 25 27 }: 26 28 let 27 - dir = "stk-code"; 28 29 assets = fetchsvn { 29 30 url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; 30 - rev = "18218"; 31 - sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw"; 31 + rev = "18464"; 32 + sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa"; 32 33 name = "stk-assets"; 33 34 }; 34 35 ··· 44 45 # has been fixed to support it. 45 46 "enet" 46 47 # Internal library of STK, nothing to do about it 48 + "graphics_engine" 49 + # Internal library of STK, nothing to do about it 47 50 "graphics_utils" 48 51 # This irrlicht is bundled with cmake 49 52 # whereas upstream irrlicht still uses 50 53 # archaic Makefiles, too complicated to switch to. 51 54 "irrlicht" 52 55 # Not packaged to this date 53 - "libraqm" 54 - # Not packaged to this date 55 56 "libsquish" 56 57 # Not packaged to this date 57 58 "sheenbidi" 58 - ] 59 - # Our system angelscript causes linking error on ARM 60 - # ld: libangelscript.so: undefined reference to 61 - # `CallSystemFunctionNative(asCContext*, asCScriptFunction*, void*, unsigned int*, void*, unsigned long&, void*)' 62 - # Bundled angelscript compiles fine 63 - ++ lib.optional stdenv.hostPlatform.isAarch64 "angelscript"; 59 + # Not packaged to this date 60 + "tinygettext" 61 + # Not packaged to this date (needed on Darwin) 62 + "mojoal" 63 + ]; 64 64 in 65 65 stdenv.mkDerivation rec { 66 66 67 67 pname = "supertuxkart"; 68 - version = "1.2"; 68 + version = "1.3"; 69 69 70 70 src = fetchFromGitHub { 71 71 owner = "supertuxkart"; 72 72 repo = "stk-code"; 73 73 rev = version; 74 - sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6"; 75 - name = dir; 74 + sha256 = "1llyxkdc4m9gnjxqaxlpwvv3ayvpw2bfjzfkkrljaxhznq811g0l"; 76 75 }; 77 - 78 - patches = [ 79 - (fetchpatch { 80 - # Fix build with SDL 2.0.14 81 - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705"; 82 - sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n"; 83 - }) 84 - ]; 85 76 86 77 postPatch = '' 87 78 # Deletes all bundled libs in stk-code/lib except those ··· 93 84 --replace 'NOT (APPLE OR HAIKU)) AND USE_SYSTEM_WIIUSE' 'NOT (HAIKU)) AND USE_SYSTEM_WIIUSE' 94 85 ''; 95 86 96 - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; 87 + nativeBuildInputs = [ 88 + cmake 89 + pkg-config 90 + makeWrapper 91 + ]; 97 92 98 93 buildInputs = [ 99 94 SDL2 ··· 107 102 harfbuzz 108 103 mcpp 109 104 wiiuse 105 + angelscript 106 + sqlite 110 107 ] 111 - ++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript 108 + ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder 112 109 ++ lib.optional stdenv.hostPlatform.isLinux openal 113 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa ]; 110 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa libsamplerate ]; 114 111 115 112 cmakeFlags = [ 116 - "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs 117 - # doesn't work with our 2.35.0 on aarch64-linux 118 - "-DUSE_SYSTEM_ANGELSCRIPT=${if !stdenv.hostPlatform.isAarch64 then "ON" else "OFF"}" 113 + "-DBUILD_RECORDER=${if (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) then "ON" else "OFF"}" 114 + "-DUSE_SYSTEM_ANGELSCRIPT=ON" 119 115 "-DCHECK_ASSETS=OFF" 120 116 "-DUSE_SYSTEM_WIIUSE=ON" 121 117 "-DOpenGL_GL_PREFERENCE=GLVND"