diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-04-21 07:58:51 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-04-21 07:59:42 +0100 |
commit | 9acfaa8c6115944561d5513c4731e4d07dbd9764 (patch) | |
tree | 8c8634e8883db1600adbaab6999ac3eec89469ab /pkgs/games/rili | |
parent | 592db127b171bb553bd86ca1f114108f2a355927 (diff) |
rili: fix build on gcc-11
Without the change the build fails on `master` as: ``` tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int') 90 | if(Buf<=0) return false; | ~~~^~~ ```
Diffstat (limited to 'pkgs/games/rili')
-rw-r--r-- | pkgs/games/rili/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index a0082d28d506b..3a87fc0523c7b 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -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"; |