From dcac3ec730176549cd52a9a42db2001dc652c30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 7 May 2020 11:58:37 +0200 Subject: Remove overlay that overrides the php version --- modules/private/websites/tools/mail/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'modules/private/websites/tools/mail/default.nix') diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index dda2d45..217ef1a 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix @@ -4,7 +4,9 @@ let inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins; env = config.myEnv.tools.roundcubemail; }; - rainloop = pkgs.callPackage ./rainloop.nix {}; + rainloop = pkgs.callPackage ./rainloop.nix { + rainloop = pkgs.rainloop-community; + }; cfg = config.myServices.websites.tools.email; pcfg = config.services.phpfpm.pools; in @@ -60,12 +62,17 @@ in user = "wwwrun"; group = "wwwrun"; settings = roundcubemail.phpFpm.pool; - phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig; + phpOptions = config.services.phpfpm.phpOptions + '' + date.timezone = 'CET' + extension=${pkgs.php72Packages.imagick}/lib/php/extensions/imagick.so + ''; + phpPackage = pkgs.php72; }; services.phpfpm.pools.rainloop = { user = "wwwrun"; group = "wwwrun"; settings = rainloop.phpFpm.pool; + phpPackage = pkgs.php72; }; system.activationScripts = { roundcubemail = roundcubemail.activationScript; -- cgit v1.2.3