From 819134cdcdbfd2373025f80dd7a721e2dcde0615 Mon Sep 17 00:00:00 2001 From: Justin Chen <42143810+StarryReverie@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:02:33 +0800 Subject: [PATCH] fbida: fix build with GCC 15 --- pkgs/by-name/fb/fbida/function-parameters.patch | 16 ++++++++++++++++ pkgs/by-name/fb/fbida/package.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/fb/fbida/function-parameters.patch diff --git a/pkgs/by-name/fb/fbida/function-parameters.patch b/pkgs/by-name/fb/fbida/function-parameters.patch new file mode 100644 index 000000000000..10fb4482f142 --- /dev/null +++ b/pkgs/by-name/fb/fbida/function-parameters.patch @@ -0,0 +1,16 @@ +diff --git a/jpeg/62/jpeglib.h b/jpeg/62/jpeglib.h +index d1be8dd..38436ef 100644 +--- a/jpeg/62/jpeglib.h ++++ b/jpeg/62/jpeglib.h +@@ -814,11 +814,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo)); + * Note JPP requires double parentheses. + */ + +-#ifdef HAVE_PROTOTYPES + #define JPP(arglist) arglist +-#else +-#define JPP(arglist) () +-#endif + + + /* Short forms of external names for systems with brain-damaged linkers. diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix index 1464389e1115..8f269d0eacea 100644 --- a/pkgs/by-name/fb/fbida/package.nix +++ b/pkgs/by-name/fb/fbida/package.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { url = "https://git.kraxel.org/cgit/fbida/patch/?id=1bb8a8aa29845378903f3c690e17c0867c820da2"; sha256 = "0n5vqbp8wd87q60zfwdf22jirggzngypc02ha34gsj1rd6pvwahi"; }) + # Prevents using function declaration without explicit parameters. + ./function-parameters.patch ]; nativeBuildInputs = [