From f72c123b6e94a7af1f2ed7e3391b8f786773582d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 9 Jan 2021 11:57:09 -0500
Subject: [PATCH] nixos/nextcloud: remove duplicate php.ini entries

---
 nixos/modules/services/web-apps/nextcloud.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 448522ad5e8..a2d6d48fd40 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -11,7 +11,7 @@ let
       enabled
       ++ (with all; [ apcu redis memcached imagick ]) # Necessary for vanilla nextcloud
       ++ cfg.phpExtraExtensions all; # Enabled by user
-    extraConfig = phpOptionsStr;
+    extraConfig = toKeyValue phpOptions;
   };
 
   toKeyValue = generators.toKeyValue {
@@ -23,7 +23,6 @@ let
     post_max_size = cfg.maxUploadSize;
     memory_limit = cfg.maxUploadSize;
   } // cfg.phpOptions;
-  phpOptionsStr = toKeyValue phpOptions;
 
   occ = pkgs.writeScriptBin "nextcloud-occ" ''
     #! ${pkgs.runtimeShell}
@@ -522,7 +521,6 @@ in {
         pools.nextcloud = {
           user = "nextcloud";
           group = "nextcloud";
-          phpOptions = phpOptionsStr;
           phpPackage = phpPackage;
           phpEnv = {
             NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";