From 013b4a6d0e3d7397f2c03ef498e7b81fb4598bab Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 20 Dec 2025 15:35:48 +0100 Subject: [PATCH] hplip: fix build with gcc15 --- pkgs/by-name/hp/hplip/gcc-compatability.patch | 14 ++++++++++++++ pkgs/by-name/hp/hplip/package.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/hp/hplip/gcc-compatability.patch diff --git a/pkgs/by-name/hp/hplip/gcc-compatability.patch b/pkgs/by-name/hp/hplip/gcc-compatability.patch new file mode 100644 index 000000000000..65abfa6328eb --- /dev/null +++ b/pkgs/by-name/hp/hplip/gcc-compatability.patch @@ -0,0 +1,14 @@ +diff --git a/scan/sane/ledmi.h b/scan/sane/ledmi.h +index a987c5d..f72847b 100644 +--- a/scan/sane/ledmi.h ++++ b/scan/sane/ledmi.h +@@ -162,7 +162,7 @@ struct ledm_session + int bb_open(struct ledm_session*); + int bb_close(struct ledm_session*); + int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int); +-int bb_is_paper_in_adf(); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ ++int bb_is_paper_in_adf(struct ledm_session*); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */ + SANE_Status bb_start_scan(struct ledm_session*); + int bb_get_image_data(struct ledm_session*, int); + int bb_end_page(struct ledm_session*, int); + diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index fa9cd6bf492d..57065682b7f6 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -144,6 +144,8 @@ python3Packages.buildPythonApplication { # don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share. # See: https://github.com/NixOS/nixpkgs/issues/21796 ./hplip-3.20.11-nixos-cups-ppd-search-path.patch + # https://bugs.launchpad.net/hplip/+bug/2096650 + ./gcc-compatability.patch # Remove all ImageProcessor functionality since that is closed source (fetchurl {