diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index 6907eb8796a8..0c0b6c603cbc 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -53,10 +53,14 @@ let p = cfg.package.override ( { inherit phpCfg; - withPgsql = cfg.database.type == "pgsql"; - withMysql = cfg.database.type == "mysql"; inherit (cfg) minifyStaticFiles; } + // lib.optionalAttrs (cfg.database.type == "postgresql") { + withPostgreSQL = true; + } + // lib.optionalAttrs (cfg.database.type == "mysql") { + withMySQL = true; + } // lib.optionalAttrs (lib.isAttrs cfg.minifyStaticFiles) ( with cfg.minifyStaticFiles; { diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 7a00ae7dab49..463cc274b641 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -5,8 +5,8 @@ dash, php, phpCfg ? null, - withPgsql ? true, # “strongly recommended” according to docs - withMysql ? false, + withPostgreSQL ? true, # “strongly recommended” according to docs + withMySQL ? false, minifyStaticFiles ? false, # default files are often not minified esbuild, lightningcss, @@ -67,14 +67,14 @@ php.buildComposerProject2 (finalAttrs: { pdo simplexml ]) - ++ lib.optionals withPgsql ( + ++ lib.optionals withPostgreSQL ( with all; [ pdo_pgsql pgsql ] ) - ++ lib.optionals withMysql ( + ++ lib.optionals withMySQL ( with all; [ mysqli