summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-05-29 07:36:35 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-05-29 07:36:52 +0100
commitd2ef633388ebdef6da2cc294dddcd73f7bb270a4 (patch)
tree87f3dc2f50d79b28d7f14459a3e977a59f284ea3
parent0831857a140328c5c40be233eaa73130620a44b2 (diff)
downloadnixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar.gz
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar.bz2
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar.lz
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar.xz
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.tar.zst
nixpkgs-d2ef633388ebdef6da2cc294dddcd73f7bb270a4.zip
sil: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
      `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
-rw-r--r--pkgs/games/sil/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix
index 5f589ede2bc..2e6c50daa82 100644
--- a/pkgs/games/sil/default.nix
+++ b/pkgs/games/sil/default.nix
@@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
     buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
   '';
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
+  #     `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   installPhase = ''
     # the makefile doesn't have a sensible install target, so we hav to do it ourselves
     mkdir -p $out/bin