Unverified Commit 7495f3f8 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

mariadb*: fix build for x86_64-darwin and musl 

The previous change of moving CXXFLAGS into env overwrote the
env variables specified in the "common" attrSet which is the
base for the attrs passed to mkDerivation.
parent 054a330c

pkgs/servers/sql/mariadb/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -365,9 +365,11 @@ let 
            rm -r "$out"/OFF

          '';



        env = lib.optionalAttrs stdenv.hostPlatform.isi686 {

        env =

          lib.optionalAttrs stdenv.hostPlatform.isi686 {

            CXXFLAGS = "-fpermissive";

        };

          }

          // (common.env or { });



        passthru = {

          inherit client;