diff --git a/pkgs/by-name/li/libtas/package.nix b/pkgs/by-name/li/libtas/package.nix index f4ca0fb87aa3..18c8dfa25b23 100644 --- a/pkgs/by-name/li/libtas/package.nix +++ b/pkgs/by-name/li/libtas/package.nix @@ -2,28 +2,41 @@ lib, stdenv, fetchFromGitHub, + fetchurl, autoreconfHook, pkg-config, SDL2, alsa-lib, ffmpeg, - lua5_3, + lua5_4, qt5, + xorg, file, binutils, makeDesktopItem, + + # Forces libTAS to run in X11. + # Enabled by default because libTAS does not support Wayland. + withForceX11 ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libtas"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "clementgallet"; repo = "libTAS"; rev = "v${finalAttrs.version}"; - hash = "sha256-n4iaJG9k+/TFfGMDCYL83Z6paxpm/gY3thP9T84GeQU="; + hash = "sha256-/hyKJ8HGLN7hT+9If/lcp0C7GnhJMRpc7EKDgA1kQcI="; }; + patches = [ + # Fixes `undefined symbol: SDL_Log` errors + (fetchurl { + url = "https://github.com/clementgallet/libTAS/commit/779ff0fb0f3accfc62949680d85ecf96b28d18ef.patch"; + hash = "sha256-xAaTWIXt8FkMu6GE5mBWtLypROFZ1aEqmBTtG+6rTWk="; + }) + ]; nativeBuildInputs = [ autoreconfHook @@ -34,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 alsa-lib ffmpeg - lua5_3 + lua5_4 qt5.qtbase ]; @@ -58,6 +71,13 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg ] } \ + --suffix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + xorg.libXi + ffmpeg.lib + ] + } \ + ${lib.optionalString withForceX11 "--set QT_QPA_PLATFORM xcb"} \ --set-default LIBTAS_SO_PATH $out/lib/libtas.so '';