From cdda5f59fa2dd714858716f99d380e2f099a9d92 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 12 Jul 2025 17:32:34 +0200 Subject: [PATCH] scribus: fix build with poppler 25.07.0 (cherry picked from commit a7e801b185f6d893fb4fae83f4c304195152d7a9) --- pkgs/applications/office/scribus/default.nix | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 42f157f81562..3b3e804befd4 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -4,6 +4,7 @@ cmake, cups, fetchurl, + fetchpatch, fontconfig, freetype, harfbuzzFull, @@ -67,16 +68,27 @@ stdenv.mkDerivation (finalAttrs: { qt5.qttools ]; - meta = with lib; { - maintainers = with maintainers; [ - arthsmn - ]; + patches = [ + (fetchpatch { + name = "fix-build-poppler-25.06.0.patch"; + url = "https://github.com/scribusproject/scribus/commit/8dcf8d777bd85a0741c455961f2de382e3ed47ec.patch"; + hash = "sha256-JBHCgvEJnYrUdtLnFSXTfr1FFin4uUNUnddYwfRbn7k="; + }) + (fetchpatch { + name = "fix-build-poppler-25.07.0.patch"; + url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch"; + hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk="; + }) + ]; + + meta = { + maintainers = with lib.maintainers; [ arthsmn ]; description = "Desktop Publishing (DTP) and Layout program"; mainProgram = "scribus"; homepage = "https://www.scribus.net"; # There are a lot of licenses... # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 - license = with licenses; [ + license = with lib.licenses; [ bsd3 gpl2Plus mit