mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
18 lines
642 B
Diff
18 lines
642 B
Diff
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");
|