Merge pull request #199932 from trofi/zsnes-zhf

zsnes: pin to c++14 to fix build with gcc-11
2022-11-06 22:12:52 -03:00
parent 29fc067736 eccb0a9b80
commit 6c49cc6681
1 changed files with 2 additions and 1 deletions
@@ -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