diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-08 00:11:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 00:11:08 +0200 |
| commit | 1c0456d56a18fe380761e55baf42253da784af44 (patch) | |
| tree | d2e5cd1c09c2ba46278720cd2e0df24d481c68a3 /pkgs/games | |
| parent | f8b1f22f03e63a968c93a3412b364e85dafb5f05 (diff) | |
| parent | d8b2dd91e0bf7aba7328f268b20058e281be443e (diff) | |
| download | nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar.gz nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar.bz2 nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar.lz nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar.xz nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.tar.zst nixpkgs-1c0456d56a18fe380761e55baf42253da784af44.zip | |
Merge pull request #176587 from trofi/workaround-fno-common-for-gargoyle
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/gargoyle/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 7058f680f4e..f5d23091b48 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -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 = |