akonadi: fix self paths
This commit is contained in:
parent
c7c4d2e9ae
commit
b31dc33e33
@ -19,7 +19,7 @@ index 44ceec5..eb5fa50 100644
|
||||
QCoreApplication::instance()->exit(255);
|
||||
});
|
||||
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/akonadiserver"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
|
||||
}
|
||||
|
||||
~StorageProcessControl() override
|
||||
@ -28,7 +28,7 @@ index 44ceec5..eb5fa50 100644
|
||||
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
|
||||
});
|
||||
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/akonadi_agent_server"), args, RestartOnCrash);
|
||||
+ start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
|
||||
}
|
||||
|
||||
~AgentServerProcessControl() override
|
||||
@ -41,7 +41,7 @@ index 8e92e08..f98dfd8 100644
|
||||
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
|
||||
const QStringList arguments = QStringList() << executable << identifier();
|
||||
- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
|
||||
+ const QString agentLauncherExec = QLatin1String(CMAKE_INSTALL_FULL_BINDIR "/akonadi_agent_launcher");
|
||||
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
|
||||
mController->start(agentLauncherExec, arguments);
|
||||
}
|
||||
return true;
|
||||
@ -122,7 +122,7 @@ index 1a437ac..3550f9d 100644
|
||||
|
||||
// generate config file
|
||||
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
|
||||
+ const QString globalConfig = QLatin1String(CMAKE_INSTALL_PREFIX "/etc/xdg/akonadi/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 actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
|
||||
if (globalConfig.isEmpty()) {
|
||||
|
@ -33,5 +33,6 @@ mkDerivation {
|
||||
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
|
||||
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
|
||||
''-DNIXPKGS_POSTGRES_INITDB=\"\"''
|
||||
''-DNIX_OUT=\"${placeholder "out"}\"''
|
||||
];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user