diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-05 00:01:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 00:01:58 +0000 |
| commit | 100a9b96cea76d78b4481172c8ab11f8c5245fe3 (patch) | |
| tree | cad4e15fce6c762b0af0777b94d26c522d90c732 /pkgs/games | |
| parent | fe2479b166b82acc00a7414e8d783ec0acfdb9a9 (diff) | |
| parent | 0bb74f147bd0adaef1b69964c451c7a1f497098f (diff) | |
| download | nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar.gz nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar.bz2 nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar.lz nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar.xz nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.tar.zst nixlib-100a9b96cea76d78b4481172c8ab11f8c5245fe3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/gimx/default.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 9c2b260f1dbf..4173ac0cc2d6 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, curl, libusb1, xorg, libxml2 , ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: let @@ -21,7 +22,23 @@ in stdenv.mkDerivation rec { sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; }; - patches = [ ./conf.patch ]; + patches = [ + ./conf.patch + + # gcc-13 build fixes: + # https://github.com/matlo/GIMX/pull/705 + (fetchpatch { + name = "gcc-13-headers.patch"; + url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch"; + hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs="; + }) + (fetchpatch { + name = "gcc-13-protos.patch"; + url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch"; + hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash |