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.
This commit is contained in:
Yarny0
2024-09-18 19:51:00 +02:00
parent 86d7a802cb
commit 97e1737419
2 changed files with 1 additions and 81 deletions
@@ -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" ];
};
})
+1 -8
View File
@@ -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 { };