nixpkgs/pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch
2015-10-30 16:10:37 -05:00

31 lines
927 B
Diff

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