Unverified Commit f23b4b96 authored by Alex James's avatar Alex James
Browse files

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. 896199fe
("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
parent fbc17ef9

pkgs/by-name/sh/shaka-packager/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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 =