diff --git a/pkgs/by-name/wo/woff2/gcc15.patch b/pkgs/by-name/wo/woff2/gcc15.patch new file mode 100644 index 000000000000..7ba9eee11f1d --- /dev/null +++ b/pkgs/by-name/wo/woff2/gcc15.patch @@ -0,0 +1,37 @@ +From 08ece7871775c0d7bf4fdff64b961cdc256adf6c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:12:03 +0100 +Subject: [PATCH] include/woff2/output.h: add missing include + +Without the change `woff2` build fails on upcoming `gcc-15` as: + + In file included from src/woff2_out.cc:9: + include/woff2/output.h:73:25: error: expected ')' before '*' token + 73 | WOFF2MemoryOut(uint8_t* buf, size_t buf_size); + | ~ ^ + | ) + include/woff2/output.h:79:3: error: 'uint8_t' does not name a type + 79 | uint8_t* buf_; + | ^~~~~~~ + include/woff2/output.h:16:1: note: 'uint8_t' is defined in header ''; + this is probably fixable by adding '#include ' + 15 | #include + +++ |+#include + 16 | +--- + include/woff2/output.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/woff2/output.h b/include/woff2/output.h +index dc78ccf..b12d538 100644 +--- a/include/woff2/output.h ++++ b/include/woff2/output.h +@@ -9,6 +9,8 @@ + #ifndef WOFF2_WOFF2_OUT_H_ + #define WOFF2_WOFF2_OUT_H_ + ++#include ++ + #include + #include + #include diff --git a/pkgs/by-name/wo/woff2/package.nix b/pkgs/by-name/wo/woff2/package.nix index 22d3ce49e41a..b6d15a53a520 100644 --- a/pkgs/by-name/wo/woff2/package.nix +++ b/pkgs/by-name/wo/woff2/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; # Need to explicitly link to brotlicommon - patches = lib.optional static ./brotli-static.patch; + patches = lib.optional static ./brotli-static.patch ++ [ ./gcc15.patch ]; nativeBuildInputs = [ cmake