diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 2b1e370f697d..7537b44f8d60 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   flit-core,
@@ -37,12 +38,16 @@ buildPythonPackage rec {
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
-  # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
-  # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
-  postPatch = ''
-    substituteInPlace ufmt/tests/__init__.py \
-      --replace-fail "from .cli import CliTest" ""
-  '';
+  patches = [
+    # Fix click 8.2.x incompatibility
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    # https://github.com/omnilib/ufmt/pull/260
+    (fetchpatch2 {
+      name = "fix-click-incompatibility.patch";
+      url = "https://github.com/omnilib/ufmt/pull/260/commits/7980d7cd0a29fbd287e10d939248ef7c9d38a660.patch";
+      hash = "sha256-97/jQVGCC+PXk8uxyF/M7XlLuVqJ5SgQZd/MXkaiO70=";
+    })
+  ];
 
   build-system = [ flit-core ];