2017-01-20 16:44:21 +00:00
|
|
|
Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
|
|
|
|
===================================================================
|
|
|
|
|
--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
|
|
|
|
|
+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
|
2016-04-21 17:01:22 +01:00
|
|
|
@@ -48,10 +48,6 @@
|
2021-01-22 19:52:48 +00:00
|
|
|
#include <sys/types.h>
|
2016-04-21 17:01:22 +01:00
|
|
|
#endif
|
2021-01-22 19:52:48 +00:00
|
|
|
|
2016-04-21 17:01:22 +01:00
|
|
|
-// We cannot rely on the $PATH environment variable, because D-Bus activation
|
|
|
|
|
-// clears it. So we have to use a reasonable default.
|
|
|
|
|
-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
|
|
|
|
|
-
|
2021-01-22 19:52:48 +00:00
|
|
|
int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
|
2016-04-21 17:01:22 +01:00
|
|
|
{
|
|
|
|
|
int ret = 0;
|
|
|
|
|
@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
|
|
|
|
|
|
|
|
|
|
void ClockHelper::toHwclock()
|
|
|
|
|
{
|
2020-04-06 22:49:47 +01:00
|
|
|
- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
|
2017-05-26 21:43:31 +01:00
|
|
|
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
|
2016-04-21 17:01:22 +01:00
|
|
|
if (!hwclock.isEmpty()) {
|
|
|
|
|
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
|
|
|
|
|
}
|
