From 19efe422f074a95f78006d390f29faa0a71af489 Mon Sep 17 00:00:00 2001 From: detroyejr Date: Sat, 20 Jan 2024 16:11:14 -0500 Subject: [PATCH] cataclysm-dda: Patch cataclysm-dda and cataclysm-dda-git. Release 0.G needs 3 patches to build successfully with gcc 13. These can be removed after the next release. [patch] disable dangling reference warning [patch] fix build with gcc 13 [patch] cleanup autogenerated prefix.h --- pkgs/games/cataclysm-dda/git.nix | 15 ++++++++++++++- pkgs/games/cataclysm-dda/stable.nix | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index c7090838b862..155f900e96f3 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs +{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs , tiles ? true, Cocoa , debug ? false , useXdgDir ? false @@ -25,6 +25,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 0e4ca1aad882..90eab89a8349 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -30,6 +30,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [