libtas: 1.4.5 -> 1.4.6 + several fixes (#433123)
This commit is contained in:
commit
9019c83547
@ -2,28 +2,41 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchurl,
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
SDL2,
|
SDL2,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
ffmpeg,
|
ffmpeg,
|
||||||
lua5_3,
|
lua5_4,
|
||||||
qt5,
|
qt5,
|
||||||
|
xorg,
|
||||||
file,
|
file,
|
||||||
binutils,
|
binutils,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
|
|
||||||
|
# Forces libTAS to run in X11.
|
||||||
|
# Enabled by default because libTAS does not support Wayland.
|
||||||
|
withForceX11 ? true,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libtas";
|
pname = "libtas";
|
||||||
version = "1.4.5";
|
version = "1.4.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "clementgallet";
|
owner = "clementgallet";
|
||||||
repo = "libTAS";
|
repo = "libTAS";
|
||||||
rev = "v${finalAttrs.version}";
|
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 = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
@ -34,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
SDL2
|
SDL2
|
||||||
alsa-lib
|
alsa-lib
|
||||||
ffmpeg
|
ffmpeg
|
||||||
lua5_3
|
lua5_4
|
||||||
qt5.qtbase
|
qt5.qtbase
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -58,6 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
ffmpeg
|
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
|
--set-default LIBTAS_SO_PATH $out/lib/libtas.so
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user