From 5ddc759a4879cec6c87e853eec339dcf5546f6d5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 19:19:58 +0100 Subject: [PATCH] dillo: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here --- pkgs/applications/networking/browsers/dillo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 8af0c1bc8e67..72a1601d1872 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; + # Workaround build failure on -fno-common toolchains: + # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; + # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--enable-ssl" ]; meta = with lib; {