diff options
Diffstat (limited to 'pkgs/applications/graphics/gscan2pdf/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index bbf52e105a284..0989c07d8a6f9 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, # 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 }: @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { ./image-utf8-fix.patch ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ librsvg sane-backends sane-frontends ] ++ @@ -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 |