summary refs log tree commit diff
path: root/pkgs/servers/hylafaxplus
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-05-12 00:02:59 +0200
committerajs124 <git@ajs124.de>2021-05-12 00:02:59 +0200
commit62b12d749b3b5487f0cd1ae316d2647415a485e3 (patch)
tree0352528ec85dfea05d89de736c95b26f9b2193fa /pkgs/servers/hylafaxplus
parentc58155c87c80461c63fccdee2d121e822b235a71 (diff)
downloadnixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar.gz
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar.bz2
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar.lz
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar.xz
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.tar.zst
nixpkgs-62b12d749b3b5487f0cd1ae316d2647415a485e3.zip
hylafaxplus: fix build
Diffstat (limited to 'pkgs/servers/hylafaxplus')
-rw-r--r--pkgs/servers/hylafaxplus/default.nix3
-rw-r--r--pkgs/servers/hylafaxplus/libtiff-4.2.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
index fc75003f392..e8bf832a15c 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -67,6 +67,9 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
     inherit sha256;
   };
+  patches = [
+    ./libtiff-4.2.patch  # adjust configure check to work with libtiff > 4.1
+  ];
   # Note that `configure` (and maybe `faxsetup`) are looking
   # for a couple of standard binaries in the `PATH` and
   # hardcode their absolute paths in the new package.
diff --git a/pkgs/servers/hylafaxplus/libtiff-4.2.patch b/pkgs/servers/hylafaxplus/libtiff-4.2.patch
new file mode 100644
index 00000000000..5da106565f0
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/libtiff-4.2.patch
@@ -0,0 +1,13 @@
+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'