diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-01 12:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 12:00:58 +0000 |
| commit | 18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734 (patch) | |
| tree | 7f09de5aac11016e7dd8a89567547a43148ec71f /pkgs/games | |
| parent | ee08be2ebdb497d3149ccdc3927f714a3640f6fd (diff) | |
| parent | dbc93a12161bff01eba5902fbba6d539dd6c7b0c (diff) | |
| download | nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.gz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.bz2 nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.lz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.xz nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.tar.zst nixlib-18bc3c64e66d0fd2bb4b4fbfbc8e9b80e4c58734.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/cataclysm-dda/git.nix | 15 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/stable.nix | 13 |
2 files changed, 27 insertions, 1 deletions
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 ++ [ |