Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

2018-03-03 22:40:32 +02:00
parent a5913ce272 618ac29687
commit 1e107443ad
101 changed files with 2988 additions and 748 deletions
@@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec {
    "-DINSTALL_SHAREDIR=share/mysql"
  ];

+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

  prePatch = ''