swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-19 20:09:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292506 from K900/akonadi-mysql

Browse source 
kdePackages.akonadi: restore mysql backend
This commit is contained in:
K900 2024-03-01 19:17:42 +03:00 committed by GitHub
parent 85667f39c9 299251e8d4
commit c999f2e369
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/kde/gear/akonadi/default.nix
View file

@ -1,16 +1,25 @@
{
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
pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch Normal file
View file

@ -0,0 +1,12 @@
--- 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)) {