mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 11:53:27 +00:00
a47d6e0fd6
And also: - move platform and arch to outer let-in - patch tzdata paths to use the nix store - set `outputs` to `[ "out" "man" ]` - append `nixpkgs` `hare version`'s output - compact `postFixup` phase - rework description - move `binutils-unwrapped` only to `buildInputs` [1]: https://nixpk.gs/pr-tracker.html?pr=265124
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha
|
|
index 26d78ab1..6861bfe8 100644
|
|
--- a/time/chrono/+freebsd.ha
|
|
+++ b/time/chrono/+freebsd.ha
|
|
@@ -2,7 +2,7 @@
|
|
// (c) Hare authors <https://harelang.org>
|
|
|
|
def LOCALTIME_PATH: str = "/etc/localtime";
|
|
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
|
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
|
|
|
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
|
// leap second data.
|
|
diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha
|
|
index 600f606c..8d5617e2 100644
|
|
--- a/time/chrono/+linux.ha
|
|
+++ b/time/chrono/+linux.ha
|
|
@@ -2,8 +2,8 @@
|
|
// (c) Hare authors <https://harelang.org>
|
|
|
|
def LOCALTIME_PATH: str = "/etc/localtime";
|
|
-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/";
|
|
+def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/";
|
|
|
|
// The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI
|
|
// leap second data.
|
|
-export def UTC_LEAPSECS_FILE: str = "/usr/share/zoneinfo/leap-seconds.list";
|
|
+export def UTC_LEAPSECS_FILE: str = "@tzdata@/share/zoneinfo/leap-seconds.list";
|