libtas: 1.4.5 -> 1.4.6 + several fixes (#433123)

authored by Yohann Boniface and committed by GitHub 9019c835 ae0ba2b2

+24 -4
+24 -4
pkgs/by-name/li/libtas/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 + fetchurl, 5 6 autoreconfHook, 6 7 pkg-config, 7 8 SDL2, 8 9 alsa-lib, 9 10 ffmpeg, 10 - lua5_3, 11 + lua5_4, 11 12 qt5, 13 + xorg, 12 14 file, 13 15 binutils, 14 16 makeDesktopItem, 17 + 18 + # Forces libTAS to run in X11. 19 + # Enabled by default because libTAS does not support Wayland. 20 + withForceX11 ? true, 15 21 }: 16 22 17 23 stdenv.mkDerivation (finalAttrs: { 18 24 pname = "libtas"; 19 - version = "1.4.5"; 25 + version = "1.4.6"; 20 26 21 27 src = fetchFromGitHub { 22 28 owner = "clementgallet"; 23 29 repo = "libTAS"; 24 30 rev = "v${finalAttrs.version}"; 25 - hash = "sha256-n4iaJG9k+/TFfGMDCYL83Z6paxpm/gY3thP9T84GeQU="; 31 + hash = "sha256-/hyKJ8HGLN7hT+9If/lcp0C7GnhJMRpc7EKDgA1kQcI="; 26 32 }; 33 + patches = [ 34 + # Fixes `undefined symbol: SDL_Log` errors 35 + (fetchurl { 36 + url = "https://github.com/clementgallet/libTAS/commit/779ff0fb0f3accfc62949680d85ecf96b28d18ef.patch"; 37 + hash = "sha256-xAaTWIXt8FkMu6GE5mBWtLypROFZ1aEqmBTtG+6rTWk="; 38 + }) 39 + ]; 27 40 28 41 nativeBuildInputs = [ 29 42 autoreconfHook ··· 34 47 SDL2 35 48 alsa-lib 36 49 ffmpeg 37 - lua5_3 50 + lua5_4 38 51 qt5.qtbase 39 52 ]; 40 53 ··· 58 71 ffmpeg 59 72 ] 60 73 } \ 74 + --suffix LD_LIBRARY_PATH : ${ 75 + lib.makeLibraryPath [ 76 + xorg.libXi 77 + ffmpeg.lib 78 + ] 79 + } \ 80 + ${lib.optionalString withForceX11 "--set QT_QPA_PLATFORM xcb"} \ 61 81 --set-default LIBTAS_SO_PATH $out/lib/libtas.so 62 82 ''; 63 83