diff --git a/pkgs/applications/office/scribus/poppler-0.73.0.patch b/pkgs/applications/office/scribus/poppler-0.73.0.patch new file mode 100644 index 00000000000..d8cf14b48c2 --- /dev/null +++ b/pkgs/applications/office/scribus/poppler-0.73.0.patch @@ -0,0 +1,12 @@ +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -28,7 +28,7 @@ for which a new license (GPL+exception) is in place. + #include "selection.h" + #include "vgradient.h" + +-#include ++#include + #include + #include + #include diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 4b1595db42a..f8bd244e039 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -4,18 +4,20 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); - revision = "22730"; + revision = "22805"; in stdenv.mkDerivation rec { name = "scribus-unstable-${version}"; - version = "2018-10-13"; + version = "2019-01-14"; src = fetchsvn { url = "svn://scribus.net/trunk/Scribus"; rev = revision; - sha256 = "1nlg4qva0fach8fi07r1pakjjlijishpwzlgpnxyaz7r31yjaw63"; + sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1"; }; + patches = [ ./poppler-0.73.0.patch ]; + enableParallelBuilding = true; buildInputs = [