diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-04-21 19:43:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-21 19:43:06 +0200 |
commit | 241d162a05ad8f99524d6babe9d5a7bcd0fbfb49 (patch) | |
tree | e09dc51d15d0d3ee5e6139bbfbfa9103d17c3440 /pkgs/applications/graphics | |
parent | 25a77d37f32347875a5079d9f1beb192f0a5e93b (diff) | |
parent | 87eabf9c4defa60c12436590b64a68ad4fad790d (diff) |
Merge pull request #298561 from Yarny0/hylafax-update-libtiff-and-tools
replace `libtiff_4_5` with `libtiff_and_tools`, update `hylafaxplus`
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index bbf52e105a284..d7ebb0a747ea3 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -2,7 +2,7 @@ # libs librsvg, sane-backends, sane-frontends, # runtime dependencies - imagemagick, libtiff_4_5, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies xvfb-run, liberation_ttf, file, tesseract }: @@ -82,7 +82,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/gscan2pdf" \ --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ - --prefix PATH : "${libtiff_4_5}/bin" \ + --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ @@ -98,10 +98,7 @@ perlPackages.buildPerlPackage rec { nativeCheckInputs = [ imagemagick - # Needs older libtiff version, because it stopped packageing tools like - # tiff2pdf and others in version 4.6. These tools are necessary for gscan2pdf. - # See commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a for in-depth explanation. - libtiff_4_5 + libtiff djvulibre poppler_utils ghostscript |