From d3c992949ed32e02d2e27d5cfd6feb369b259cb0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 21:56:34 +0100 Subject: [PATCH] coriander: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: subtitles.o:src/coriander.h:110: multiple definition of `main_window'; main.o:src/coriander.h:110: first defined here --- pkgs/applications/video/coriander/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 7f57c79c5fe5..540339f05a56 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; }; + # Workaround build failure on -fno-common toolchains: + # ld: subtitles.o:src/coriander.h:110: multiple definition of + # `main_window'; main.o:src/coriander.h:110: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' cp ${automake}/share/automake-*/mkinstalldirs . '';