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. 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); }); - start(QStringLiteral("akonadiserver"), args, RestartOnCrash); + start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); } ~StorageProcessControl() override @@ -84,7 +84,7 @@ public: []() { qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; }); - start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); + start(QLatin1String(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 +++ b/src/akonadicontrol/agentprocessinstance.cpp @@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) } else { 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(NIX_OUT "/bin/akonadi_agent_launcher"); mController->start(agentLauncherExec, arguments); } return true; 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() #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 actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { avail'>...Fixes <https://issues.guix.gnu.org/74800>. The check for make-session stopped working after update to2022-11-24gnu: gawk: Update to 5.2.1....* gnu/packages/gawk.scm (gawk): Update to 5.2.1. Efraim Flashner 2022-09-08gnu: gawk: Update to 5.2.0....* gnu/packages/gawk.scm (gawk): Update to 5.2.0. Marius Bakke 2022-07-22Merge branch 'staging' into core-updatesMarius Bakke 2022-07-08gnu: Add cppawk and cppawk-egawk....* gnu/packages/gawk.scm (cppawk, cppawk-egawk): New variables. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Paul A. Patience 2022-07-08gnu: Add egawk-next....* gnu/packages/gawk.scm (egawk-next): New variable. Signed-2023-11-07build: Fix spelling in m4 macros....* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Fix spelling of parameter. (GUIX_CHECK_FILE_NAME_LIMITS): Fix spelling of maximum. Change-Id: I93c80441393622a4bc06daa475eee13874cca527 Efraim Flashner 2023-03-16build: Correct guix_system on musl libc distros....* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents the macro from mis-parsing the host OS, which causes breakage when building from source. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Antero Mejr Patience 2022-06-26gnu: gawk: Use G-expressions and remove labels....* gnu/packages/gawk.scm (gawk)[arguments]: Convert to G-expression. Use SEARCH-INPUT-FILE instead of label. Marius Bakke 2022-06-26gnu: gawk: Update to 5.1.1....* gnu/packages/gawk.scm (gawk): Update to 5.1.1. [arguments]: Enable previously failing test. Marius Bakke