From a59257a7710340d9e583ef484249e75098dbd489 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 30 May 2022 06:57:05 +0100 Subject: [PATCH] typespeed: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: typespeed-typespeed.o:/build/typespeed-0.6.5/src/typespeed.h:69: multiple definition of `opt'; typespeed-file.o:/build/typespeed-0.6.5/src/typespeed.h:69: first defined here --- pkgs/games/typespeed/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 1581ab138945..0c2d928dd5ea 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { patches = [ ./typespeed-config-in-home.patch ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: typespeed-typespeed.o:/build/typespeed-0.6.5/src/typespeed.h:69: multiple definition of + # `opt'; typespeed-file.o:/build/typespeed-0.6.5/src/typespeed.h:69: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--datadir=\${out}/share/" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];