public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122650 from helsinki-systems/fix/hylafaxplus

Browse Source 
hylafaxplus: fix build
This commit is contained in:
Maximilian Bosch 2021-05-12 09:06:28 +02:00 committed by GitHub
commit e6635d8b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/hylafaxplus/default.nix
View File

@ -67,6 +67,9 @@ stdenv.mkDerivation {
url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
inherit sha256; inherit sha256;
}; };
patches = [
./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1
];
# Note that `configure` (and maybe `faxsetup`) are looking # Note that `configure` (and maybe `faxsetup`) are looking
# for a couple of standard binaries in the `PATH` and # for a couple of standard binaries in the `PATH` and
# hardcode their absolute paths in the new package. # hardcode their absolute paths in the new package.

13
pkgs/servers/hylafaxplus/libtiff-4.2.patch Normal file
View File

@ -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'