ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-14 16:40:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #169540 from trofi/fix-rili-on-gcc-11

Browse Source 
rili: fix build on gcc-11
This commit is contained in:
Bobby Rong 2022-04-22 23:08:29 +08:00 committed by GitHub
commit 32e217d0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/games/rili/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }:
{ lib, stdenv, fetchurl, fetchpatch, SDL_mixer, SDL, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "ri_li";
@ -9,7 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd";
};
patches = [ ./moderinze_cpp.patch ];
patches = [
./moderinze_cpp.patch
# Build fix for gcc-11 pending upstream inclusion:
# https://sourceforge.net/p/ri-li/bugs/2/
(fetchpatch {
name = "gcc-11.patch";
url = "https://sourceforge.net/p/ri-li/bugs/2/attachment/0001-Fix-build-on-gcc-11.patch";
sha256 = "01il9lm3amwp3b435ka9q63p0jwlzajwnbshyazx6n9vcnrr17yw";
})
];
CPPFLAGS = "-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include";