Unverified Commit dbc79664 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #296885 from wegank/protobuf-23-fix 

protobuf_23: fix build
parents 308671db c317b4b5

pkgs/by-name/ju/justbuild/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ stdenv.mkDerivation rec { 
  '';



  meta = with lib; {

    broken = stdenv.isDarwin;

    broken = true; # last successful build 2024-01-26

    description = "a generic build tool";

    homepage = "https://github.com/just-buildsystem/justbuild";

    license = licenses.asl20;

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -24236,7 +24236,9 @@ with pkgs; 














  protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };















  protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { };













  protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { };













  protobuf_23 = callPackage ../development/libraries/protobuf/23.nix {













    abseil-cpp = abseil-cpp_202301;













  };















  protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {















    abseil-cpp = abseil-cpp_202103;















  };