From 5beb038fecab0aa214c95163d38b00dbbe9562e8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 5 Jan 2026 21:29:10 +0000 Subject: [PATCH 1/2] zsnes: fix the build against `gcc-15` Without the change the build fails on `master` at `x86_640linux` as: chips/dsp3emu.c:31:23: error: 'bool' cannot be defined via 'typedef' 31 | typedef unsigned char bool; | ^~~~ --- pkgs/applications/emulators/zsnes/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index bf0a810f4866..2d54b9ec752c 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -60,7 +60,8 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here # Use pre-c++17 standard (c++17 forbids throw annotations) - env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14"; + # Use pre-c23: chips/dsp3emu.c:31:23: error: 'bool' cannot be defined via 'typedef' + env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14 -std=gnu17"; preConfigure = '' cd src From 1851854e52615e334e13bd378da14c44b2cb5785 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 5 Jan 2026 21:56:17 +0000 Subject: [PATCH 2/2] zsnes: enable parallel building --- pkgs/applications/emulators/zsnes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index 2d54b9ec752c..383e44be626a 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation { configureFlags = [ "--enable-release" ]; + enableParallelBuilding = true; + postInstall = '' function installIcon () { mkdir -p $out/share/icons/hicolor/$1/apps/