cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xonotic: fix compiling with GCC11 (#170036)

Browse source 
Upstream issue: https://gitlab.com/xonotic/darkplaces/-/issues/361
This commit is contained in:
Dee Anzorge 2022-04-24 17:40:56 +02:00 committed by GitHub
parent 50121730ca
commit a3c605936a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/games/xonotic/default.nix
View file

@ -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 ]