colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gimx: fix build against `gcc-13` 

Without the change the build in `master` fails as
https://hydra.nixos.org/build/247555199:

    gimx.c:195:6: error: implicit declaration of function 'getenv' [-Werror=implicit-function-declaration]
      195 |   if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); }
          |      ^~~~~~
This commit is contained in:
Sergei Trofimovich 2024-02-08 08:29:56 +00:00
parent cd5c10f696
commit 8b21717c1c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/games/gimx/default.nix
View File

@ -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