summary refs log tree commit diff
path: root/pkgs/applications/office/scribus
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-04 20:52:59 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-04 23:02:30 +0100
commita46fa21e430f4714fab840b5c2ea52aca4d37865 (patch)
treedda71121f151d51a095fb4b21bc36dfc5636222d /pkgs/applications/office/scribus
parentbce9e720df195eb0e6cd4a3735b6717ea4877bba (diff)
downloadnixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar.gz
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar.bz2
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar.lz
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar.xz
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.tar.zst
nixpkgs-a46fa21e430f4714fab840b5c2ea52aca4d37865.zip
scribusUnstable: Fix build with Poppler 0.83
Another fallout from https://github.com/NixOS/nixpkgs/pull/74558
Diffstat (limited to 'pkgs/applications/office/scribus')
-rw-r--r--pkgs/applications/office/scribus/unstable.nix15
1 files changed, 14 insertions, 1 deletions
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  ];