From 5ace72cd6c0b9e2d294026ddfcff4886b64e6be1 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 5 Apr 2020 16:30:02 +0200 Subject: [PATCH] nixos/nextcloud: Use php.enabledExtensions --- nixos/modules/services/web-apps/nextcloud.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 82783a2b6aa4..df5bdee99fc5 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,16 +6,17 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = pkgs.php74.buildEnv { - extensions = e: with e; [ - bcmath calendar curl exif ftp filter gd gettext gmp intl json ldap - mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql - pdo_sqlite pgsql readline session soap sodium sqlite3 zip zlib mbstring - posix ctype dom simplexml xmlreader xmlwriter - apcu redis memcached imagick - ]; - extraConfig = phpOptionsStr; - }; + phpPackage = + let + base = pkgs.php74; + in + base.buildEnv { + extensions = e: with e; + base.enabledExtensions ++ [ + apcu redis memcached imagick + ]; + extraConfig = phpOptionsStr; + }; toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = ";