From 8d0dce91bc0190eab64811aa40c9ae021891032f Mon Sep 17 00:00:00 2001 From: Alexander Khodyrev Date: Sun, 16 Jul 2023 21:45:26 +0300 Subject: [PATCH] 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. --- pkgs/development/interpreters/tcl/generic.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 6ce6e35189bf..894ed91de5c9 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 '';