Merge pull request #199932 from trofi/zsnes-zhf

zsnes: pin to c++14 to fix build with gcc-11
NixOS · Nov 7, 2022 · 6c49cc6 · 6c49cc6
2 parents 29fc067 + eccb0a9
commit 6c49cc6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix
@@ -34,7 +34,8 @@ in 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
-  NIX_CFLAGS_COMPILE = "-fcommon";
+  # Use pre-c++17 standard (c++17 forbids throw annotations)
+  NIX_CFLAGS_COMPILE = "-fcommon -std=c++14";
 
   preConfigure = ''
     cd src