pyrox.dev
Merge pull request #292506 from K900/akonadi-mysql
kdePackages.akonadi: restore mysql backend
+11
-2
pkgs/kde/gear/akonadi/default.nix
+11
-2
pkgs/kde/gear/akonadi/default.nix
···
1
{
2
mkKdeDerivation,
3
qttools,
4
accounts-qt,
5
kaccounts-integration,
6
shared-mime-info,
7
xz,
8
}:
9
mkKdeDerivation {
10
pname = "akonadi";
11
12
-
# FIXME(later): investigate nixpkgs patches
13
14
extraNativeBuildInputs = [qttools shared-mime-info];
15
-
extraBuildInputs = [kaccounts-integration accounts-qt xz];
16
}
···
1
{
2
+
lib,
3
mkKdeDerivation,
4
qttools,
5
accounts-qt,
6
kaccounts-integration,
7
shared-mime-info,
8
xz,
9
+
mariadb,
10
}:
11
mkKdeDerivation {
12
pname = "akonadi";
13
14
+
patches = [
15
+
# Always regenerate MySQL config, as the store paths don't have accurate timestamps
16
+
./ignore-mysql-config-timestamp.patch
17
+
];
18
+
19
+
extraCmakeFlags = [
20
+
"-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
21
+
];
22
23
extraNativeBuildInputs = [qttools shared-mime-info];
24
+
extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb];
25
}
+12
pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch
+12
pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch
···
···
1
+
--- a/src/server/storage/dbconfigmysql.cpp
2
+
+++ b/src/server/storage/dbconfigmysql.cpp
3
+
@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
4
+
bool confUpdate = false;
5
+
QFile actualFile(actualConfig);
6
+
// update conf only if either global (or local) is newer than actual
7
+
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
8
+
- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
9
+
+ if (true) {
10
+
QFile globalFile(globalConfig);
11
+
QFile localFile(localConfig);
12
+
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {