From d7c2557a41723df3646df08b71b19a1d76aa03f6 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 13 Jan 2026 18:11:41 +0100
Subject: [PATCH] shaka-packager: fix GCC15 build

Requires adding cstdlib includes wherever plain uintN_t types are used
---
 pkgs/by-name/sh/shaka-packager/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index da252b4bf5f8..d574b87c96ee 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   testers,
   cmake,
@@ -46,6 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
     # The last step is necessary to keep the patch size to a minimum, otherwise we'd have
     # to add the namespace identifiers everywhere a dependency is used.
     ./0002-Unvendor-dependencies.patch
+    # GCC15 build fixes
+    # Taken from https://github.com/shaka-project/shaka-packager/pull/1506,
+    # but excludes the changes to the shell script as we do not use it.
+    (fetchpatch {
+      name = "GCC15-cstdint-includes";
+      url = "https://github.com/shaka-project/shaka-packager/commit/b1c79e50521b8725117dfe0a45fe44c2f2dbd4fb.patch";
+      excludes = [ "packager/testing/test_dockers.sh" ];
+      hash = "sha256-8dBQ+eENZKFB9ONjmPBlxy8P/iinyeUS8zhlxz6rnQ4=";
+    })
   ];
 
   nativeBuildInputs = [