diff --git a/pkgs/by-name/x2/x265/gcc15-fixes.patch b/pkgs/by-name/x2/x265/gcc15-fixes.patch new file mode 100644 index 000000000000..ce89375861b9 --- /dev/null +++ b/pkgs/by-name/x2/x265/gcc15-fixes.patch @@ -0,0 +1,24 @@ +From 43e696a388ddf4ce5f4b9f756e726544b6310092 Mon Sep 17 00:00:00 2001 +From: ReenigneArcher +Date: Wed, 9 Jul 2025 14:41:33 +0000 +Subject: [PATCH] fix(dynamicHDR10): undefined-uint8_t + +--- + source/dynamicHDR10/json11/json11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source/dynamicHDR10/json11/json11.cpp b/source/dynamicHDR10/json11/json11.cpp +index 762577735..c111ebb82 100644 +--- a/dynamicHDR10/json11/json11.cpp ++++ b/dynamicHDR10/json11/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.h" + #include + #include ++#include + #include + #include + #include +-- +2.49.0 + diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix index 54c93e9d7b69..a7b00775e138 100644 --- a/pkgs/by-name/x2/x265/package.nix +++ b/pkgs/by-name/x2/x265/package.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { patches = [ ./darwin-__rdtsc.patch + # fix compilation with gcc15 + # https://bitbucket.org/multicoreware/x265_git/pull-requests/36 + ./gcc15-fixes.patch ] # TODO: remove after update to version 4.2 ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [