diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-05 15:18:59 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-06-05 15:18:59 +0100 |
| commit | e3b9cba7cb47ec3e09d2e2801873cc834158520e (patch) | |
| tree | 2840cc2b2889c3a32df3c51365d4355af871f880 /pkgs/games/xboard | |
| parent | 88e0f07bd610fb9dd41c166ed3769fb83fd10af5 (diff) | |
| download | nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar.gz nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar.bz2 nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar.lz nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar.xz nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.tar.zst nixpkgs-e3b9cba7cb47ec3e09d2e2801873cc834158520e.zip | |
xboard: pull patch pending upstream inclusion for -fno-common toolchain support
Without the change build fails on upstream gcc-10 as:
ld: evalgraph.o:(.bss+0x20): multiple definition of `ics_type'; backend.o:(.bss+0x1df910): first defined here
ld: nevalgraph.o:(.bss+0x8): multiple definition of `currPvInfo'; backend.o:(.bss+0x1df908): first defined here
Diffstat (limited to 'pkgs/games/xboard')
| -rw-r--r-- | pkgs/games/xboard/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 663207bd23c..eefbb90114f 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , libX11 , xorgproto , libXt @@ -28,6 +29,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY="; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://savannah.gnu.org/patch/index.php?10211 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/patch/download.php?file_id=53275"; + sha256 = "sha256-ZOo9jAy1plFjhC5HXJQvXL+Zf7FL14asV3G4AwfgqTY="; + }) + ]; + buildInputs = [ libX11 xorgproto |