Unverified Commit c999f2e3 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #292506 from K900/akonadi-mysql

kdePackages.akonadi: restore mysql backend
parents 85667f39 299251e8
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
{
  lib,
  mkKdeDerivation,
  qttools,
  accounts-qt,
  kaccounts-integration,
  shared-mime-info,
  xz,
  mariadb,
}:
mkKdeDerivation {
  pname = "akonadi";

  # FIXME(later): investigate nixpkgs patches
  patches = [
    # Always regenerate MySQL config, as the store paths don't have accurate timestamps
    ./ignore-mysql-config-timestamp.patch
  ];

  extraCmakeFlags = [
    "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
  ];

  extraNativeBuildInputs = [qttools shared-mime-info];
  extraBuildInputs = [kaccounts-integration accounts-qt xz];
  extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb];
}
+12 −0
Original line number Diff line number Diff line
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
     bool confUpdate = false;
     QFile actualFile(actualConfig);
     // update conf only if either global (or local) is newer than actual
-    if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
-        || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+    if (true) {
         QFile globalFile(globalConfig);
         QFile localFile(localConfig);
         if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {