From 912921a74c8c67663048de66c6d11e1ae63dc10e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 12 Jan 2019 01:45:52 +0100 Subject: [PATCH] Make mysqli a shared extension, and load it where necessary --- virtual/modules/websites/chloe/default.nix | 6 ++++++ virtual/modules/websites/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/virtual/modules/websites/chloe/default.nix b/virtual/modules/websites/chloe/default.nix index e5c3db7..fb1f602 100644 --- a/virtual/modules/websites/chloe/default.nix +++ b/virtual/modules/websites/chloe/default.nix @@ -37,6 +37,9 @@ in { }; services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; + services.myPhpfpm.poolPhpConfigs.chloe_prod = '' + extension=${pkgs.php}/lib/php/extensions/mysqli.so + ''; system.activationScripts.chloe_prod = chloe_prod.activationScript; services.myWebsites.production.modules = chloe_prod.apache.modules; services.myWebsites.production.vhostConfs.chloe = { @@ -49,6 +52,9 @@ in { (lib.mkIf cfg.integration.enable { security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; + services.myPhpfpm.poolPhpConfigs.chloe_prod = '' + extension=${pkgs.php}/lib/php/extensions/mysqli.so + ''; system.activationScripts.chloe_dev = chloe_dev.activationScript; services.myWebsites.integration.modules = chloe_dev.apache.modules; services.myWebsites.integration.vhostConfs.chloe = { diff --git a/virtual/modules/websites/default.nix b/virtual/modules/websites/default.nix index 54284e8..a9e62a5 100644 --- a/virtual/modules/websites/default.nix +++ b/virtual/modules/websites/default.nix @@ -116,7 +116,7 @@ in }).overrideAttrs(old: rec { # Didn't manage to build with mysqli + mysql_config connector configureFlags = old.configureFlags ++ [ - "--with-mysqli=mysqlnd" + "--with-mysqli=shared,mysqlnd" ]; # preConfigure = (old.preConfigure or "") + '' # export CPPFLAGS="$CPPFLAGS -I${pkgs.mariadb}/include/mysql/server"; -- 2.41.0