| 1 | This is based on the respectve patch from NixPkgs, but with the parts pinning
|
| 2 | mysql and postgresql executables removed. See our package definition on why.
|
| 3 |
|
| 4 | diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
|
| 5 | |
| 6 | |
| 7 | @@ -47,7 +47,7 @@ public:
|
| 8 | connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
|
| 9 | QCoreApplication::instance()->exit(255);
|
| 10 | });
|
| 11 | - start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
|
| 12 | + start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
|
| 13 | }
|
| 14 |
|
| 15 | ~StorageProcessControl() override
|
| 16 | @@ -69,7 +69,7 @@ public:
|
| 17 | connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
|
| 18 | qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
|
| 19 | });
|
| 20 | - start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
|
| 21 | + start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
|
| 22 | }
|
| 23 |
|
| 24 | ~AgentServerProcessControl() override
|
| 25 | diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
|
| 26 | |
| 27 | |
| 28 | @@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
|
| 29 | } else {
|
| 30 | Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
|
| 31 | const QStringList arguments = QStringList() << executable << identifier();
|
| 32 | - const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
|
| 33 | + const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
|
| 34 | mController->start(agentLauncherExec, arguments);
|
| 35 | }
|
| 36 | return true;
|
| 37 | diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
|
| 38 | |
| 39 | |
| 40 | @@ -215,7 +215,7 @@ bool DbConfigMysql::startInternalServer()
|
| 41 | #endif
|
| 42 |
|
| 43 | // generate config file
|
| 44 | - const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
|
| 45 | + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
|
| 46 | const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
|
| 47 | const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
|
| 48 | if (globalConfig.isEmpty()) {
|