diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-03 17:00:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 17:00:56 +0200 |
| commit | 2204f77859534b0725495df6a268513fe2c09a5f (patch) | |
| tree | cb1f577a3198439a8ebab9897effbeac5dcf310d /pkgs/games | |
| parent | 48503d271ec8ded3fb5a79cc0ae90add3b1707d5 (diff) | |
| parent | a59257a7710340d9e583ef484249e75098dbd489 (diff) | |
| download | nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar.gz nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar.bz2 nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar.lz nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar.xz nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.tar.zst nixpkgs-2204f77859534b0725495df6a268513fe2c09a5f.zip | |
Merge pull request #175431 from trofi/workaround-fno-common-for-typespeed
typespeed: add -fcommon workaround
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/typespeed/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 1581ab13894..0c2d928dd5e 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { patches = [ ./typespeed-config-in-home.patch ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: typespeed-typespeed.o:/build/typespeed-0.6.5/src/typespeed.h:69: multiple definition of + # `opt'; typespeed-file.o:/build/typespeed-0.6.5/src/typespeed.h:69: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ "--datadir=\${out}/share/" ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; |