diff options
Diffstat (limited to 'pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch')
-rw-r--r-- | pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch b/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch deleted file mode 100644 index 900c4d095e8..00000000000 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Fri, 28 Aug 2015 10:16:53 -0500 -Subject: [PATCH 2/3] zoneinfo - ---- - kcms/dateandtime/helper.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp -index fc4a6b9..7b64d05 100644 ---- a/kcms/dateandtime/helper.cpp -+++ b/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone ) - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ // NixOS-specific path -+ QString tz = "/etc/zoneinfo/" + selectedzone; -+ if (!QFile::exists(tz)) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove("/etc/localtime"); --- -2.5.2 - |