diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index e8bf832a15c..bb56e63c40e 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,6 +2,7 @@ , lib , fakeroot , fetchurl +, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -68,7 +69,12 @@ stdenv.mkDerivation { inherit sha256; }; patches = [ - ./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1 + # adjust configure check to work with libtiff > 4.1 + (fetchpatch { + name = "libtiff-4.2.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6"; + sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw"; + }) ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.2.patch b/pkgs/servers/hylafaxplus/libtiff-4.2.patch deleted file mode 100644 index 5da106565f0..00000000000 --- a/pkgs/servers/hylafaxplus/libtiff-4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 7456dcb..90f0e8d 100755 ---- a/configure -+++ b/configure -@@ -2583,7 +2583,7 @@ EOF - echo '#define TIFFSTRIPBYTECOUNTS uint32' - echo '#define TIFFVERSION TIFF_VERSION' - echo '#define TIFFHEADER TIFFHeader';; -- 4.[01]) tiff_runlen_t="uint32" -+ 4.[012]) tiff_runlen_t="uint32" - tiff_offset_t="uint64" - echo '#define TIFFSTRIPBYTECOUNTS uint64' - echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'