diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
| commit | ed2b1b4b909538716abb6378971ba75fae65b7d2 (patch) | |
| tree | 25c9f8f505f3ad7d3955c556a50ef6c111e7c369 /pkgs/servers/sql/mariadb/default.nix | |
| parent | f68dbdc7c39faa5f685e34b10da0b373ad6a7c22 (diff) | |
| parent | 2970b27faf15840714feba50186e7e02d945569f (diff) | |
| download | nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.gz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.bz2 nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.lz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.xz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.zst nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers/sql/mariadb/default.nix')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index dfaf64380a9..b1c71f28a83 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation (common // { ]; cmakeFlags = common.cmakeFlags ++ [ - "-DPLUGIN_AUTH_PAM=OFF" + "-DPLUGIN_AUTH_PAM=NO" "-DWITHOUT_SERVER=ON" "-DWITH_WSREP=OFF" "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" @@ -207,7 +207,8 @@ in stdenv.mkDerivation (common // { ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ "-DWITH_JEMALLOC=yes" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DPLUGIN_AUTH_PAM=OFF" + "-DPLUGIN_AUTH_PAM=NO" + "-DPLUGIN_AUTH_PAM_V1=NO" "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_PLUGIN_S3=1" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ |