From 2fd4f1f45700e181a1dae6c5200ab4643363208b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 20 Jan 2024 18:50:20 -0300 Subject: [PATCH] fceux: 2.6.4 -> 2.6.5 Also, pin stdenv to GCC12 - yet another case of updated incompatible C++ standards I suppose. Oh! Remove it when next version arrives ;) --- pkgs/applications/emulators/fceux/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index a6ba7f96746d..0a6a23d83204 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -1,24 +1,24 @@ { lib -, stdenv -, fetchFromGitHub , SDL2 , cmake +, fetchFromGitHub , lua , minizip , pkg-config +, stdenv , wrapQtAppsHook , x264 }: stdenv.mkDerivation (finalAttrs: { pname = "fceux"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "TASEmulators"; repo = "fceux"; - rev = "fceux-${finalAttrs.version}"; - hash = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-sY7UyslRPeLw8IDDhx0VObNCUTy3k16Xx3aGBJjxNAk="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8cb2b021154..2db85a2a4b3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2698,7 +2698,10 @@ with pkgs; emulationstation = callPackage ../applications/emulators/emulationstation { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { lua = lua5_1; }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { + lua = lua5_1; + stdenv = gcc12Stdenv; + }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };