about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Khodyrev <a@akho.name>2023-07-16 21:45:26 +0300
committerAlexander Khodyrev <a@akho.name>2023-07-16 21:45:26 +0300
commit8d0dce91bc0190eab64811aa40c9ae021891032f (patch)
treebd6e3ea62f351c4e6cf7153a2099861b505e84cd
parentb49c4f87f9db35ec29ab53534890de14dee8d36b (diff)
tcl: fix #243831
Add a dependency on tzdata, use tzdata's zoneinfo in clock.tcl. Remove
other paths clock.tcl may try to use for zoneinfo to avoid non-store dependency.
-rw-r--r--pkgs/development/interpreters/tcl/generic.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 6ce6e35189bf2..894ed91de5c9d 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, callPackage, makeSetupHook
+, tzdata
 
 # Version specific stuff
 , release, version, src
@@ -15,6 +16,14 @@ let
 
       setOutputFlags = false;
 
+      postPatch = ''
+        substituteInPlace library/clock.tcl \
+          --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
+          --replace "/usr/share/lib/zoneinfo" "" \
+          --replace "/usr/lib/zoneinfo" "" \
+          --replace "/usr/local/etc/zoneinfo" ""
+      '';
+
       preConfigure = ''
         cd unix
       '';