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 =