diff options
| author | ajs124 <git@ajs124.de> | 2021-07-21 02:33:50 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-07-21 02:33:50 +0200 |
| commit | 3027914a579a79976af5461036f1808fa0aaac20 (patch) | |
| tree | 8d9d48e69adc39cd9ee16d25fb4394081dc61145 /pkgs/servers/hylafaxplus | |
| parent | 4218023470e5d24f3f571963ba54c74327e6c1fe (diff) | |
| download | nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar.gz nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar.bz2 nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar.lz nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar.xz nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.tar.zst nixpkgs-3027914a579a79976af5461036f1808fa0aaac20.zip | |
hylafaxplus: fix build
Diffstat (limited to 'pkgs/servers/hylafaxplus')
| -rw-r--r-- | pkgs/servers/hylafaxplus/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/hylafaxplus/libtiff-4.patch | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 4ce0d63f6be..04be8c63599 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,7 +2,6 @@ , lib , fakeroot , fetchurl -, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -70,11 +69,7 @@ stdenv.mkDerivation { }; patches = [ # 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"; - }) + ./libtiff-4.patch ]; # 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.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch new file mode 100644 index 00000000000..daf7b4f7d05 --- /dev/null +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/706154 +--- 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.[0-9]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' |