public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

akonadi: fix self paths

Browse Source
This commit is contained in:
Thomas Tuegel 2021-04-27 16:36:43 -05:00
parent c7c4d2e9ae
commit b31dc33e33
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
View File

@ -19,7 +19,7 @@ index 44ceec5..eb5fa50 100644
QCoreApplication::instance()->exit(255); QCoreApplication::instance()->exit(255);
}); });
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); - start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
+ start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/akonadiserver"), args, RestartOnCrash); + start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
} }
~StorageProcessControl() override ~StorageProcessControl() override
@ -28,7 +28,7 @@ index 44ceec5..eb5fa50 100644
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
}); });
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); - 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 ~AgentServerProcessControl() override
@ -41,7 +41,7 @@ index 8e92e08..f98dfd8 100644
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier(); const QStringList arguments = QStringList() << executable << identifier();
- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); - 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); mController->start(agentLauncherExec, arguments);
} }
return true; return true;
@ -122,7 +122,7 @@ index 1a437ac..3550f9d 100644
// generate config file // generate config file
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); - 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 localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) { if (globalConfig.isEmpty()) {

1
pkgs/applications/kde/akonadi/default.nix
View File

@ -33,5 +33,6 @@ mkDerivation {
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
''-DNIX_OUT=\"${placeholder "out"}\"''
]; ];
} }