From a46fa21e430f4714fab840b5c2ea52aca4d37865 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 4 Dec 2019 20:52:59 +0100 Subject: [PATCH] scribusUnstable: Fix build with Poppler 0.83 Another fallout from https://github.com/NixOS/nixpkgs/pull/74558 --- pkgs/applications/office/scribus/unstable.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 3c5ae4c4b0a..2a602b094ba 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, +{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: @@ -14,6 +14,19 @@ mkDerivation rec { sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E="; }; + patches = [ + # fix build with Poppler 0.82 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + }) + # fix build with Poppler 0.83 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ];