Merge pull request #133489 from sbruder/update-fceux

This commit is contained in:
Sandro 2021-08-12 01:51:48 +02:00 committed by GitHub
commit b003277d29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 30 deletions

View File

@ -1,40 +1,24 @@
{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkg-config}: { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "fceux-unstable"; pname = "fceux";
version = "2020-01-29"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TASVideos"; owner = "TASVideos";
repo = "fceux"; repo = pname;
rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337"; rev = "${pname}-${version}";
sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0=";
}; };
nativeBuildInputs = [ pkg-config scons ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ buildInputs = [ SDL2 lua5_1 minizip x264 ];
zlib SDL lua5_1
];
sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false"; meta = with lib; {
prefixKey = "--prefix=";
# sed allows scons to find libraries in nix.
# mkdir is a hack to make scons succeed. It still doesn't
# actually put the files in there due to a bug in the SConstruct file.
# OPENGL doesn't work because fceux dlopens the library.
preBuild = ''
sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
export CC="gcc"
export CXX="g++"
mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
'';
meta = {
description = "A Nintendo Entertainment System (NES) Emulator"; description = "A Nintendo Entertainment System (NES) Emulator";
license = lib.licenses.gpl2; license = licenses.gpl2Plus;
maintainers = [ lib.maintainers.scubed2 ]; maintainers = with maintainers; [ sbruder scubed2 ];
homepage = "http://www.fceux.com/"; homepage = "http://www.fceux.com/";
platforms = lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -31361,7 +31361,7 @@ with pkgs;
faustStk = callPackage ../applications/audio/faustStk { }; faustStk = callPackage ../applications/audio/faustStk { };
fceux = callPackage ../misc/emulators/fceux { }; fceux = libsForQt5.callPackage ../misc/emulators/fceux { };
flockit = callPackage ../tools/backup/flockit { }; flockit = callPackage ../tools/backup/flockit { };