From f23b4b9641c8c7a66dcd353cb54105f161728b65 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Fri, 9 May 2025 01:48:15 -0500
Subject: [PATCH] shaka-packager: pin protobuf_29

shaka-packager currently pins abseil-cpp to abseil-cpp_202401 and
overrides protobuf to use the same version of abseil-cpp. 896199fee5bb
("protobuf: 29.3 -> 30.0") switched the default version of protobuf to
protobuf_30. This broke compilation of shaka-packager as protobuf_30 is
incompatible with abseil-cpp_202401 [1]. Fix the build by pinning
protobuf to protobuf_29.

[1]: https://hydra.nixos.org/build/295978700
---
 pkgs/by-name/sh/shaka-packager/package.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix            |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index f893540846c5..da252b4bf5f8 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -7,7 +7,7 @@
   ninja,
   python3,
   nix-update-script,
-  abseil-cpp,
+  abseil-cpp_202401,
   curl,
   gtest,
   nlohmann_json,
@@ -16,7 +16,7 @@
   libwebm,
   mbedtls,
   mimalloc,
-  protobuf,
+  protobuf_29,
   zlib,
 }:
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       # pssh_box.py.
       ps.protobuf
     ]))
-    abseil-cpp
+    abseil-cpp_202401
     curl
     gtest
     nlohmann_json
@@ -69,9 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
     libwebm
     mbedtls
     mimalloc
-    (protobuf.override {
+    (protobuf_29.override {
       # must be the same version as for shaka-packager
-      inherit abseil-cpp;
+      abseil-cpp = abseil-cpp_202401;
     })
     zlib
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e71c2e9367ef..025d17357654 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13459,10 +13459,6 @@ with pkgs;
 
   mpvScripts = mpv-unwrapped.scripts;
 
-  shaka-packager = callPackage ../by-name/sh/shaka-packager/package.nix {
-    abseil-cpp = abseil-cpp_202401;
-  };
-
   mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
 
   murmur =