diff options
| author | Raphael Robatsch <raphael-git@tapesoftware.net> | 2024-01-13 01:56:15 +0100 |
|---|---|---|
| committer | Raphael Robatsch <raphael-git@tapesoftware.net> | 2024-01-13 01:56:31 +0100 |
| commit | 1d7100a082dffe49d94f1afe26be484cd07e3c6f (patch) | |
| tree | f4d105e3e16f517d90a839be45dcd405af18fb3f /pkgs/games | |
| parent | 6023efb996565eeb24c39cae6597a3d2114b9538 (diff) | |
zeroad: fix build with new gcc and libxml
Fixes #280611.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/0ad/game.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 1738c26659d22..eadb8bd274575 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -55,7 +55,24 @@ stdenv.mkDerivation rec { "-L${nvidia-texture-tools.lib}/lib/static" ]; - patches = [ ./rootdir_env.patch ]; + patches = [ + ./rootdir_env.patch + + # Fix build with libxml v2.12 + # FIXME: Remove with next package update + (fetchpatch { + name = "libxml-2.12-fix.patch"; + url = "https://github.com/0ad/0ad/commit/d242631245edb66816ef9960bdb2c61b68e56cec.patch"; + hash = "sha256-Ik8ThkewB7wyTPTI7Y6k88SqpWUulXK698tevfSBr6I="; + }) + # Fix build with GCC 13 + # FIXME: Remove with next package update + (fetchpatch { + name = "gcc-13-fix.patch"; + url = "https://github.com/0ad/0ad/commit/093e1eb23519ab4a4633a999a555a58e4fd5343e.patch"; + hash = "sha256-NuWO64narU1JID/F3cj7lJKjo96XR7gSW0w8I3/hhuw="; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need. |