]> Cypherpunks repositories - gostls13.git/commitdiff
time: add /etc/zoneinfo as valid path for tzdata for NixOS
authorDavid Anderson <danderson@tailscale.com>
Thu, 2 Feb 2023 20:13:46 +0000 (20:13 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Sat, 4 Feb 2023 02:26:55 +0000 (02:26 +0000)
NixOS has no /usr/share, but does have tzdata at /etc/zoneinfo.

Change-Id: Ic7d7f42a215e06c2e4f5c54ee11db82240f27167
GitHub-Last-Rev: 9969dd3e2cc49b30c3cd6b0858cb60b00bcbdf60
GitHub-Pull-Request: golang/go#58267
Reviewed-on: https://go-review.googlesource.com/c/go/+/464995
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
src/time/zoneinfo_unix.go

index 67b8beb47b3ba783eac3a51bc55766afe817af4f..b52c67d069825ddcdac20a00abf145f7f7a82e55 100644 (file)
@@ -16,11 +16,13 @@ import (
 )
 
 // Many systems use /usr/share/zoneinfo, Solaris 2 has
-// /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ.
+// /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ,
+// NixOS has /etc/zoneinfo.
 var platformZoneSources = []string{
        "/usr/share/zoneinfo/",
        "/usr/share/lib/zoneinfo/",
        "/usr/lib/locale/TZ/",
+       "/etc/zoneinfo",
 }
 
 func initLocal() {