From b9dcfbbd4dc4a4ca4c40c3a0042e1d121e459eb7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 18:14:56 +0100 Subject: [PATCH] cdesktopenv: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here --- pkgs/desktops/cdesktopenv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 8039caa74be6..acb423f44bd3 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -49,6 +49,11 @@ in stdenv.mkDerivation rec { # build fails otherwise enableParallelBuilding = false; + # Workaround build failure on -fno-common toolchains: + # ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of + # `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "World" "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"