diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/desktops/plasma-5/plasma-desktop | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5/plasma-desktop')
| -rw-r--r-- | nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index 6c04081ae29a..c85d66ad0031 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -3,14 +3,14 @@ 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 @@ -48,10 +48,6 @@ - #include <sys/stat.h> + #include <sys/types.h> #endif - + -// 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"); - - int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled ) + int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) { int ret = 0; @@ -227,7 +223,7 @@ int ClockHelper::tzreset() |