From 1729877a4ca6625f751fd6248ade9419d720a4c9 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 2 Jul 2026 18:10:22 +0200
Subject: [PATCH] tcl-9_0: 9.0.3 -> 9.0.4

---
 pkgs/development/interpreters/tcl/9.0.nix     | 4 ++--
 pkgs/development/interpreters/tcl/generic.nix | 3 +++
 pkgs/development/libraries/tk/9.0.nix         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/9.0.nix b/pkgs/development/interpreters/tcl/9.0.nix
index dd134db49c11..f9733ad83162 100644
--- a/pkgs/development/interpreters/tcl/9.0.nix
+++ b/pkgs/development/interpreters/tcl/9.0.nix
@@ -4,13 +4,13 @@ callPackage ./generic.nix (
   args
   // rec {
     release = "9.0";
-    version = "${release}.3";
+    version = "${release}.4";
 
     # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated!
 
     src = fetchzip {
       url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
-      hash = "sha256-qKh2QYRy+dcX3tk6DS23YfrKfiN9V8RMU1es999KBE0=";
+      hash = "sha256-2yfj4ddGX/QT601NKG5y30LToMBu3jomFGnNUdzRaNw=";
     };
   }
 )
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 83116044fae9..13ab408ab607 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -90,6 +90,9 @@ let
       ]
       ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit";
 
+    # https://core.tcl-lang.org/thread/tktview/30e201c7111a438e2fe6aadc9d733b954874cbb9
+    env = lib.optionalAttrs (lib.versionAtLeast version "9.0") { ZIPFS_BUILD = 0; };
+
     buildFlags = lib.optionals stdenv.hostPlatform.isStatic [
       # Don't use the default Make target for static,
       # since it builds shared libraries for bundled packages.
diff --git a/pkgs/development/libraries/tk/9.0.nix b/pkgs/development/libraries/tk/9.0.nix
index 370e53059a6c..c2163cd226b4 100644
--- a/pkgs/development/libraries/tk/9.0.nix
+++ b/pkgs/development/libraries/tk/9.0.nix
@@ -11,7 +11,7 @@ callPackage ./generic.nix (
 
     src = fetchzip {
       url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
-      hash = "sha256-ssgvJdgXCtBPfnPvX9AR9uo4zGbzRGsCjOowxe5cfjM=";
+      hash = "sha256-G0V6SWe2PF/EEg2qI41c0AAVMYLcCdJtnKlkRxbs5HQ=";
     };
 
     patches = [