diff options
| author | Julian Nadeau <julian@jnadeau.ca> | 2019-02-28 15:59:40 -0500 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2019-02-28 20:59:40 +0000 |
| commit | 1aa13609b62a721d5c561022d653bc9b5bd69a82 (patch) | |
| tree | d89c832e6e45c5ef0cd22e47fe2b0dbb014b4933 /pkgs/servers/sql | |
| parent | c60d946fa30f04c6a9795d2a9d040f02253ad847 (diff) | |
| download | nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar.gz nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar.bz2 nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar.lz nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar.xz nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.tar.zst nixlib-1aa13609b62a721d5c561022d653bc9b5bd69a82.zip | |
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.
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index c23bdcd24761..249a5af5d480 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 = '' |