From dde9810bd895e3016200c7ec915b41e03c07db99 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 12 May 2020 14:30:52 +0300 Subject: [PATCH] mysql57, mysql80: build with protobuf 3.7 They fail to build with protobuf 3.8: In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23: /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory 32 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1 make[2]: *** Waiting for unfinished jobs.... --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b47de766b4..c3104b53eabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15926,12 +15926,14 @@ in inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; + protobuf = protobuf3_7; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost169; # Configure checks for specific version. + protobuf = protobuf3_7; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };