tjh.dev
1diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
2index 46363ddcb..d787f9993 100644
3--- a/kcms/krdb/krdb.cpp
4+++ b/kcms/krdb/krdb.cpp
5@@ -468,7 +468,7 @@ void runRdb(unsigned int flags)
6 proc.execute();
7
8 // Needed for applications that don't set their own cursor.
9- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
10+ QProcess::execute(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
11
12 applyGtkStyles(1);
13 applyGtkStyles(2);
14diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
15index ffec07ebf..11e70fef8 100644
16--- a/startkde/plasma-session/startup.cpp
17+++ b/startkde/plasma-session/startup.cpp
18@@ -176,7 +176,7 @@ Startup::Startup(QObject *parent)
19 }
20
21 // Keep for KF5; remove in KF6 (KInit will be gone then)
22- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
23+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
24
25 KJob *phase1 = nullptr;
26 m_lock.reset(new QEventLoopLocker);
27diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
28index 04875c358..5822af37c 100644
29--- a/startkde/startplasma-wayland.cpp
30+++ b/startkde/startplasma-wayland.cpp
31@@ -89,7 +89,7 @@ int main(int argc, char **argv)
32 out << "startplasma-wayland: Shutting down...\n";
33
34 // Keep for KF5; remove in KF6 (KInit will be gone then)
35- runSync(QStringLiteral("kdeinit5_shutdown"), {});
36+ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
37
38 out << "startplasmacompositor: Shutting down...\n";
39 cleanupPlasmaEnvironment(oldSystemdEnvironment);
40diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
41index 8e82e29c3..1ed176706 100644
42--- a/startkde/startplasma-x11.cpp
43+++ b/startkde/startplasma-x11.cpp
44@@ -87,7 +87,7 @@ int main(int argc, char **argv)
45 out << "startkde: Shutting down...\n";
46
47 // Keep for KF5; remove in KF6 (KInit will be gone then)
48- runSync(QStringLiteral("kdeinit5_shutdown"), {});
49+ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
50
51 cleanupPlasmaEnvironment(oldSystemdEnvironment);
52
53diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
54index b0158c97d..c8f7fe223 100644
55--- a/startkde/startplasma.cpp
56+++ b/startkde/startplasma.cpp
57@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber)
58 void messageBox(const QString &text)
59 {
60 out << text;
61- runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
62+ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
63 }
64
65 QStringList allServices(const QLatin1String &prefix)
66@@ -484,7 +484,7 @@ QProcess *setupKSplash()
67 if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
68 p = new QProcess;
69 p->setProcessChannelMode(QProcess::ForwardedChannels);
70- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
71+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
72 }
73 }
74 return p;