Unverified Commit bd613950 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #282444 from detroyejr/master 

cataclysm-dda: fix gcc 13 build with 3 debian patches.
parents 5db9bc42 19efe422

pkgs/games/cataclysm-dda/git.nix

+14 −1
Original line number Diff line number Diff line 
{ 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 ++ [

pkgs/games/cataclysm-dda/stable.nix

+13 −0
Original line number Diff line number Diff line
@@ -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 ++ [