mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
25057960ce
This fixes the situtation where, if `/usr/share/zoneinfo` was inaccessible/didn't otherwise exist, `howard-hinnant-date` would download and drop a `~/Downloads/tzdata` directory containing some timezone information from IANA [1]. To avoid this, we make use of the `tzdata`'s `zoneinfo`, preventing the dropping of random directories and files. [1] https://data.iana.org/time-zones/releases/tzdata2019c.tar.gz
14 lines
477 B
Diff
14 lines
477 B
Diff
diff --git a/src/tz.cpp b/src/tz.cpp
|
|
index 68436c3..2bfe19e 100644
|
|
--- a/src/tz.cpp
|
|
+++ b/src/tz.cpp
|
|
@@ -349,7 +349,7 @@ discover_tz_dir()
|
|
struct stat sb;
|
|
using namespace std;
|
|
# ifndef __APPLE__
|
|
- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
|
|
+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
|
|
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";
|
|
|
|
// Check special path which is valid for buildroot with uclibc builds
|