git.iko.soy/typeable/nixpkgs
on master help sign in
hylafaxplus: use gentoo patch for libtiff 4.2
commit9e9da7c4cb7d59a6d3d0309b6f004f31dd12027b authorYarny0 <41838844+Yarny0@users.noreply.github.com> dateSat 8 May 2021, 17:13 (6 years ago) parentd1601a4
2 files changed+7−14
pkgs/servers/hylafaxplus/default.nix+7−1 pkgs/servers/hylafaxplus/libtiff-4.2.patch−13
pkgs/servers/hylafaxplus/default.nix+7−1
@@ -2,6 +2,7 @@
22, lib
33, fakeroot
44, fetchurl
5+, fetchpatch
56, libfaketime
67, substituteAll
78## runtime dependencies
@@ -68,7 +69,12 @@ stdenv.mkDerivation {
6869 inherit sha256;
6970 };
7071 patches = [
71− ./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1
72+ # adjust configure check to work with libtiff > 4.1
73+ (fetchpatch {
74+ name = "libtiff-4.2.patch";
75+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6";
76+ sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw";
77+ })
7278 ];
7379 # Note that `configure` (and maybe `faxsetup`) are looking
7480 # for a couple of standard binaries in the `PATH` and
pkgs/servers/hylafaxplus/libtiff-4.2.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/configure b/configure
2−index 7456dcb..90f0e8d 100755
3−--- a/configure
4−+++ b/configure
5−@@ -2583,7 +2583,7 @@ EOF
6− echo '#define TIFFSTRIPBYTECOUNTS uint32'
7− echo '#define TIFFVERSION TIFF_VERSION'
8− echo '#define TIFFHEADER TIFFHeader';;
9−- 4.[01]) tiff_runlen_t="uint32"
10−+ 4.[012]) tiff_runlen_t="uint32"
11− tiff_offset_t="uint64"
12− echo '#define TIFFSTRIPBYTECOUNTS uint64'
13− echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'