From 97e1737419ded3af33ed32e7305efe0901be0ace Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sun, 8 Sep 2024 08:41:22 +0200
Subject: [PATCH] libtiff_t (fork of libtiff): drop

libtiff 4.6.0t (a fork of libtiff) was needed after libtiff
dropped some programs with version 4.6.0 that are required
by other packages (notably hylafaxplus and gscan2pdf), cf.
https://github.com/NixOS/nixpkgs/pull/298561/commits

libtiff 4.7.0 again contains those programs,
so its dependees no longer need the forked version.
Hence libtiff_t is no longer needed and can be dropped.
---
 .../libraries/libtiff/libtiff_t.nix           | 73 -------------------
 pkgs/top-level/all-packages.nix               |  9 +--
 2 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtiff/libtiff_t.nix

diff --git a/pkgs/development/libraries/libtiff/libtiff_t.nix b/pkgs/development/libraries/libtiff/libtiff_t.nix
deleted file mode 100644
index 37e48f6ea14f..000000000000
--- a/pkgs/development/libraries/libtiff/libtiff_t.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib
-, stdenv
-, fetchzip
-
-, autoreconfHook
-, pkg-config
-, sphinx
-
-, libdeflate
-, libjpeg
-, xz
-, zlib
-}:
-
-# This is a fork created by the hylafaxplus developer to
-# restore tools dropped by original libtiff in version 4.6.0.
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libtiff_t";
-  version = "4.6.0t";
-
-  src = fetchzip {
-    url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz";
-    hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4=";
-  };
-
-  patches = [
-    # FreeImage needs this patch
-    ./headers.patch
-    # libc++abi 11 has an `#include <version>`, this picks up files name
-    # `version` in the project's include paths
-    ./rename-version.patch
-  ];
-
-  postPatch = ''
-    mv VERSION VERSION.txt
-  '';
-
-  outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
-
-  postFixup = ''
-    moveToOutput include/tif_config.h $dev_private
-    moveToOutput include/tif_dir.h $dev_private
-    moveToOutput include/tif_hash_set.h $dev_private
-    moveToOutput include/tiffiop.h $dev_private
-  '';
-
-  # If you want to change to a different build system, please make
-  # sure cross-compilation works first!
-  nativeBuildInputs = [ autoreconfHook pkg-config sphinx ];
-
-  # TODO: opengl support (bogus configure detection)
-  propagatedBuildInputs = [
-    libdeflate
-    libjpeg
-    xz
-    zlib
-  ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)";
-    homepage = "http://www.libtiff.org";
-    changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html";
-    maintainers = with maintainers; [ yarny ];
-    license = licenses.libtiff;
-    platforms = platforms.unix ++ platforms.windows;
-    pkgConfigModules = [ "libtiff-4" ];
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78b35c61a1eb..f8e060c2826c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22094,14 +22094,7 @@ with pkgs;
 
   libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
 
-  inherit
-    ({
-      libtiff = callPackage ../development/libraries/libtiff { };
-      libtiff_t = callPackage ../development/libraries/libtiff/libtiff_t.nix { };
-    })
-    libtiff
-    libtiff_t
-    ;
+  libtiff = callPackage ../development/libraries/libtiff { };
 
   libtiger = callPackage ../development/libraries/libtiger { };