pyrox.dev
akonadi: use QLatin1String instead of QStringLiteral
QStringLiteral stores strings in UTF-16 encoding. Nix cannot decode such paths,
so we must use QLatin1String for strings that may be paths, or the dependency
graph will be broken!
+10
-10
pkgs/applications/kde/akonadi/akonadi-paths.patch
+10
-10
pkgs/applications/kde/akonadi/akonadi-paths.patch
···
33
33
- }
34
34
35
35
- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
36
-
+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
36
+
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
37
37
if (!mysqladminPath.isEmpty()) {
38
38
#ifndef Q_OS_WIN
39
39
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
···
42
42
}
43
43
44
44
- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
45
-
+ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
45
+
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
46
46
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
47
47
48
48
- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
49
-
+ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
49
+
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
50
50
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
51
51
52
52
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
···
55
55
mPassword = settings.value(QStringLiteral("Password")).toString();
56
56
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
57
57
- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
58
-
+ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
58
+
+ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
59
59
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
60
60
settings.endGroup();
61
61
···
84
84
85
85
// generate config file
86
86
- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
87
-
+ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
87
+
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
88
88
const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
89
89
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
90
90
if (globalConfig.isEmpty()) {
···
133
133
-
134
134
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
135
135
- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
136
-
+ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
136
+
+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
137
137
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
138
138
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
139
139
}
···
145
145
- if (mInternalServer && mServerPath.isEmpty()) {
146
146
- mServerPath = defaultServerPath;
147
147
- }
148
-
+ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
148
+
+ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
149
149
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
150
150
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
151
151
if (mInternalServer && mInitDbPath.isEmpty()) {
···
166
166
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
167
167
const QStringList arguments = QStringList() << executable << identifier();
168
168
- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
169
-
+ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
169
+
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
170
170
mController->start(agentLauncherExec, arguments);
171
171
}
172
172
return true;
···
179
179
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
180
180
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
181
181
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
182
-
+ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
182
+
+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
183
183
184
184
if (mAgentServerEnabled) {
185
185
mAgentServer = new Akonadi::ProcessControl;
186
186
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
187
187
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
188
-
+ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
188
+
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
189
189
}
190
190
191
191
#ifndef QT_NO_DEBUG