mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge pull request #176587 from trofi/workaround-fno-common-for-gargoyle
This commit is contained in:
commit
1c0456d56a
@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
|
||||
++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of
|
||||
# `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here
|
||||
# TODO: drop once updated to 2022.1 or later.
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
|
||||
|
||||
installPhase =
|
||||
|
Loading…
Reference in New Issue
Block a user