Commit 076fdda0 authored by toastal's avatar toastal
Browse files

{movim,nixos/movim}: fix database options 

Wrong casing, doesn’t work with those not creating a local database, &
has a bug with implementation on how it should be overriding the
database support to the movim package.
parent e05b6934

nixos/modules/services/web-apps/movim.nix

+6 −2
Original line number Diff line number Diff line
@@ -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;

          {

pkgs/by-name/mo/movim/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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