aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/akonadi-paths.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/akonadi-paths.patch')
-rw-r--r--gnu/packages/patches/akonadi-paths.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch
index ac08ec5448..bb4a19ede0 100644
--- a/gnu/packages/patches/akonadi-paths.patch
+++ b/gnu/packages/patches/akonadi-paths.patch
@@ -1,26 +1,26 @@
This is based on the respectve patch from NixPkgs, but with the parts pinning
-mysql and postgresql executables removed. The our package definition on why.
+mysql and postgresql executables removed. See our package definition on why.
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
-@@ -61,7 +61,7 @@ public:
- []() {
- QCoreApplication::instance()->exit(255);
- });
+@@ -47,7 +47,7 @@ public:
+ connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
+ QCoreApplication::instance()->exit(255);
+ });
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
-+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
++ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
}
-
+
~StorageProcessControl() override
-@@ -84,7 +84,7 @@ public:
- []() {
- qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
- });
+@@ -69,7 +69,7 @@ public:
+ connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
+ qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
+ });
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
-+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
++ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
}
-
+
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
--- a/src/akonadicontrol/agentprocessinstance.cpp
@@ -37,12 +37,12 @@ diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/ag
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
-@@ -209,7 +209,7 @@ bool DbConfigMysql::startInternalServer()
+@@ -215,7 +215,7 @@ bool DbConfigMysql::startInternalServer()
#endif
-
+
// generate config file
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
- const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
+ const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {