diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index b979cdd657ba..fe1eacafebbd 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -10,6 +10,10 @@ let localDB = cfg.database.host == "localhost"; user = cfg.database.username; phpWithPspell = pkgs.php83.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); + + env = { + ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell"; + }; in { options.services.roundcube = { @@ -263,7 +267,7 @@ in "catch_workers_output" = true; }; phpPackage = phpWithPspell; - phpEnv.ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell"; + phpEnv = env; }; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; @@ -282,6 +286,8 @@ in after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + environment = env; + path = [ (if localDB then config.services.postgresql.package else pkgs.postgresql) ];