diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-28 11:42:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 11:42:30 +0100 |
| commit | 8152911f615ae29021a1da614d4b3d0129bcd012 (patch) | |
| tree | 18a60d0f33a8261fd9bc7f5d65faefce33e7dc8d /pkgs/applications | |
| parent | 46903948d2f440c16407d16875be03f72c21bba3 (diff) | |
| parent | 46c427535a72a3bcd32c2e9ff0eafc0e9e399996 (diff) | |
Merge pull request #149570 from r-ryantm/auto-update/poppler-glib
poppler: 21.06.1 -> 22.01.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 24f3a555fd5af..271173a8b027c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + + # Fix build with Poppler 21.11.0. + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3622 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/5724c21b9cb7b6176a7b36ca24068b148c817e82.patch"; + sha256 = "/1p/Vkes1HuZN0v09Ey4kiT+4zrEaoSXyPAmc4O3sDg="; + }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 # TODO: Remove in Inkscape 1.1.2 diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 6aed41d7f9afd..21adb90cab9e9 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -83,6 +83,11 @@ mkDerivation rec { qttools ]; + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ erictapen |