diff options
| author | Dee Anzorge <d.anzorge@gmail.com> | 2022-04-24 17:40:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-24 17:40:56 +0200 |
| commit | a3c605936a1d4ac47c61c875cf63b3d9e0b4415d (patch) | |
| tree | 2260e0c9c78faec2d5c31926e2fb95b10cc77576 /pkgs/games/xonotic | |
| parent | 50121730cae36c893be51dedd41d2113e3c5a653 (diff) | |
xonotic: fix compiling with GCC11 (#170036)
Upstream issue: https://gitlab.com/xonotic/darkplaces/-/issues/361
Diffstat (limited to 'pkgs/games/xonotic')
| -rw-r--r-- | pkgs/games/xonotic/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 46b0b594d724b..208608f0c15b4 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem +{ lib, stdenv, fetchurl, fetchpatch, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -64,6 +64,15 @@ let sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; }; + patches = [ + # Fix to make darkplaces compile under GCC 11 + (fetchpatch { + name = "fix-darkplaces-gcc11"; + url = "https://gitlab.com/xonotic/darkplaces/-/commit/5e9e998c1759bc0085c3273fc39f9ea6f72a7dc8.patch"; + sha256 = "sha256-s0JettSg0AYr8V2mXKJ2QU125bBcX1BAu/yDciTWC5o="; + }) + ]; + nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] |