Merge pull request #117658 from r-ryantm/auto-update/poppler-glib

poppler: 21.02.0 -> 21.05.0

authored by Jan Tojnar and committed by GitHub 3f061ca1 5c18268a

+70 -23
+70 -23
pkgs/development/libraries/poppler/default.nix
··· 1 - { stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl 2 - , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg 1 + { stdenv 2 + , lib 3 + , fetchurl 4 + , fetchpatch 5 + , cmake 6 + , ninja 7 + , pkg-config 8 + , libiconv 9 + , libintl 10 + , zlib 11 + , curl 12 + , cairo 13 + , freetype 14 + , fontconfig 15 + , lcms 16 + , libjpeg 17 + , openjpeg 3 18 , withData ? true, poppler_data 4 19 , qt5Support ? false, qtbase ? null 5 20 , introspectionSupport ? false, gobject-introspection ? null 6 21 , utils ? false, nss ? null 7 - , minimal ? false, suffix ? "glib" 22 + , minimal ? false 23 + , suffix ? "glib" 24 + , inkscape 25 + , cups-filters 26 + , texlive 27 + , scribusUnstable 8 28 }: 9 29 10 30 let ··· 12 32 in 13 33 stdenv.mkDerivation (rec { 14 34 name = "poppler-${suffix}-${version}"; 15 - version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! 35 + version = "21.05.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! 36 + 37 + outputs = [ "out" "dev" ]; 16 38 17 39 src = fetchurl { 18 40 url = "${meta.homepage}/poppler-${version}.tar.xz"; 19 - sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw="; 41 + sha256 = "sha256-2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw="; 20 42 }; 21 43 22 - outputs = [ "out" "dev" ]; 44 + nativeBuildInputs = [ 45 + cmake 46 + ninja 47 + pkg-config 48 + ]; 23 49 24 - buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; 50 + buildInputs = [ 51 + libiconv 52 + libintl 53 + ] ++ lib.optional withData [ 54 + poppler_data 55 + ]; 25 56 26 57 # TODO: reduce propagation to necessary libs 27 - propagatedBuildInputs = with lib; 28 - [ zlib freetype fontconfig libjpeg openjpeg ] 29 - ++ optionals (!minimal) [ cairo lcms curl ] 30 - ++ optional qt5Support qtbase 31 - ++ optional utils nss 32 - ++ optional introspectionSupport gobject-introspection; 33 - 34 - nativeBuildInputs = [ cmake ninja pkg-config ]; 35 - 36 - # Workaround #54606 37 - preConfigure = lib.optionalString stdenv.isDarwin '' 38 - sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt 39 - ''; 40 - 41 - dontWrapQtApps = true; 58 + propagatedBuildInputs = [ 59 + zlib 60 + freetype 61 + fontconfig 62 + libjpeg 63 + openjpeg 64 + ] ++ lib.optionals (!minimal) [ 65 + cairo 66 + lcms 67 + curl 68 + ] ++ lib.optionals qt5Support [ 69 + qtbase 70 + ] ++ lib.optionals utils [ 71 + nss 72 + ] ++ lib.optionals introspectionSupport [ 73 + gobject-introspection 74 + ]; 42 75 43 76 cmakeFlags = [ 44 77 (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" ··· 49 82 (mkFlag qt5Support "QT5") 50 83 ]; 51 84 85 + dontWrapQtApps = true; 86 + 87 + # Workaround #54606 88 + preConfigure = lib.optionalString stdenv.isDarwin '' 89 + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt 90 + ''; 91 + 92 + passthru = { 93 + tests = { 94 + # These depend on internal poppler code that frequently changes. 95 + inherit inkscape cups-filters texlive scribusUnstable; 96 + }; 97 + }; 98 + 52 99 meta = with lib; { 53 100 homepage = "https://poppler.freedesktop.org/"; 54 101 description = "A PDF rendering library"; ··· 59 106 installed separately. 60 107 ''; 61 108 62 - license = licenses.gpl2; 109 + license = licenses.gpl2Plus; 63 110 platforms = platforms.all; 64 111 maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; 65 112 };