From f0c0b8d949c753d53e9f04ecfb43583fb44c20b2 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Fri, 1 Mar 2019 16:32:41 +0100
Subject: [PATCH] nixos/nextcloud: move phpPackage and phpOptions into pool

This allows to have a php configuration for nextcloud that is independent
of the global configuration.
---
 nixos/modules/services/web-apps/nextcloud.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index f1ef9aa35931..64e4a25037fe 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -360,14 +360,14 @@ in {
       };
 
       services.phpfpm = {
-        phpOptions = phpOptionsExtensions;
-        phpPackage = pkgs.php73;
         pools.nextcloud = let
           phpAdminValues = (toKeyValue
             (foldr (a: b: a // b) {}
               (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
                 phpOptions)));
         in {
+          phpOptions = phpOptionsExtensions;
+          phpPackage = pkgs.php73;
           listen = "/run/phpfpm/nextcloud";
           extraConfig = ''
             listen.owner = nginx