From f91e98652b04af19036067018a883ba46bed1ec9 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 9 Mar 2024 13:09:21 +0700 Subject: [PATCH] movim: missing extensions, allow passing PHP cfg --- pkgs/by-name/mo/movim/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 985a7808b644..9b6cb00e7ef6 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , php +, phpCfg ? null , withPgsql ? true # “strongly recommended” according to docs , withMysql ? false }: @@ -16,14 +17,16 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-9MBe2IRYxvUuCc5m7ajvIlBU7YVm4A3RABlOOIjpKoM="; }; - php = php.buildEnv { + php = php.buildEnv ({ extensions = ({ all, enabled }: enabled - ++ (with all; [ curl dom gd imagick mbstring ]) - ++ lib.optional withPgsql all.pgsql - ++ lib.optional withMysql all.mysqli + ++ (with all; [ curl dom gd imagick mbstring pdo simplexml ]) + ++ lib.optionals withPgsql (with all; [ pdo_pgsql pgsql ]) + ++ lib.optionals withMysql (with all; [ mysqli mysqlnd pdo_mysql ]) ); - }; + } // lib.optionalAttrs (phpCfg != null) { + extraConfig = phpCfg; + }); # no listed license # pinned commonmark