From 82e046535571c121b836bc2425f0fc8d5cc0b80b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 2 Feb 2023 20:13:46 +0000 Subject: [PATCH] time: add /etc/zoneinfo as valid path for tzdata for NixOS 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 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gopher Robot Reviewed-by: Brad Fitzpatrick Reviewed-by: Michael Knyszek --- src/time/zoneinfo_unix.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go index 67b8beb47b..b52c67d069 100644 --- a/src/time/zoneinfo_unix.go +++ b/src/time/zoneinfo_unix.go @@ -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() { -- 2.50.0