diff options
| -rw-r--r-- | pkgs/misc/emulators/fceux/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 14 insertions, 30 deletions
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index f76fc761abb..50e9c447f2f 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -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 { - pname = "fceux-unstable"; - version = "2020-01-29"; +stdenv.mkDerivation rec { + pname = "fceux"; + version = "2.4.0"; src = fetchFromGitHub { owner = "TASVideos"; - repo = "fceux"; - rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337"; - sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0="; }; - nativeBuildInputs = [ pkg-config scons ]; - buildInputs = [ - zlib SDL lua5_1 - ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ SDL2 lua5_1 minizip x264 ]; - sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false"; - 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 = { + meta = with lib; { description = "A Nintendo Entertainment System (NES) Emulator"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.scubed2 ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sbruder scubed2 ]; homepage = "http://www.fceux.com/"; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd22c25ec2..cff389cf951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31361,7 +31361,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; |