diff options
| author | Raphael Robatsch <raphael-git@tapesoftware.net> | 2022-09-13 18:51:37 +0200 |
|---|---|---|
| committer | Raphael Robatsch <raphael-git@tapesoftware.net> | 2022-09-13 19:55:22 +0200 |
| commit | 69c89075452808634016fbab93a4e6d6cd69a6ea (patch) | |
| tree | 57e58f31b0d0a4ca7da47bed803dbda8878ef6d5 /pkgs/games/cataclysm-dda | |
| parent | 474faf3a39be3f68d4b7d6999328dddc716c3e71 (diff) | |
cataclysm-dda: fix build
Diffstat (limited to 'pkgs/games/cataclysm-dda')
| -rw-r--r-- | pkgs/games/cataclysm-dda/stable.nix | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 52f3ca41f4808..3bf2f884ab36a 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -1,5 +1,13 @@ -{ lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs -, tiles ? true, Cocoa +{ lib +, callPackage +, CoreFoundation +, fetchFromGitHub +, fetchpatch +, pkgs +, wrapCDDA +, attachPkgs +, tiles ? true +, Cocoa , debug ? false , useXdgDir ? false }: @@ -22,6 +30,13 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path-stable.patch + + # Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083 + # Remove with next version update. + (fetchpatch { + url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch"; + hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA="; + }) ]; makeFlags = common.makeFlags ++ [ @@ -31,7 +46,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers ++ [ skeidel ]; }; }); in |