From 1aa13609b62a721d5c561022d653bc9b5bd69a82 Mon Sep 17 00:00:00 2001 From: Julian Nadeau Date: Thu, 28 Feb 2019 15:59:40 -0500 Subject: [PATCH] Use c++ 11 for MySQL 5.7 to fix build in mac (#56384) https://github.com/NixOS/nixpkgs/issues/49174 shows us the error that we were experiencing. The last successful build was https://hydra.nixos.org/build/81938220, with the first failing here: https://hydra.nixos.org/build/82083071 The difference between these 2 builds seems to be Protobuf 3.4 being updated to Protobuf 3.6. Protobuf fails because the newer version uses newer C++ features. This commit makes MySQL 5.7 use C++ 11 to fix these issues. --- pkgs/servers/sql/mysql/5.7.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index c23bdcd2476..249a5af5d48 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -57,7 +57,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = "-fpermissive -std=c++11"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = ''