Merge pull request #330634 from r-ryantm/auto-update/circumflex
[NixPkgs.git] / pkgs / desktops / plasma-5 / plasma-desktop / hwclock-path.patch
blobc85d66ad00312e31d1c14165d59347a31f2d33cf
1 Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
2 ===================================================================
3 --- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
4 +++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
5 @@ -48,10 +48,6 @@
6 #include <sys/types.h>
7 #endif
9 -// We cannot rely on the $PATH environment variable, because D-Bus activation
10 -// clears it. So we have to use a reasonable default.
11 -static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
13 int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
15 int ret = 0;
16 @@ -227,7 +223,7 @@ int ClockHelper::tzreset()
18 void ClockHelper::toHwclock()
20 - QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
21 + QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
22 if (!hwclock.isEmpty()) {
23 KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));