diff options
| author | Justin Humm <justin.humm@posteo.de> | 2019-01-14 16:53:18 +0100 |
|---|---|---|
| committer | Justin Humm <justin.humm@posteo.de> | 2019-01-15 12:47:48 +0100 |
| commit | ac891e9ea6ec9362d0ed6920c24504e002d40ebf (patch) | |
| tree | ed262864cc682ee771c0d16cba8b3cf306b63f72 /pkgs/applications/office/scribus | |
| parent | 3f0fbc0e5667d2d37bcf71b80aeb1164250baf1f (diff) | |
| download | nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar.gz nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar.bz2 nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar.lz nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar.xz nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.tar.zst nixlib-ac891e9ea6ec9362d0ed6920c24504e002d40ebf.zip | |
scribusUnstable: fix build failure from poppler bump
Poppler was upgraded in [0] and therefore the build broke, as poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1]. The patch is intended to be broght upstream and then can be reverted. [0] https://github.com/NixOS/nixpkgs/commit/7757e43fcb15f3b3e21187787edaad54614ec7e6 [1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
Diffstat (limited to 'pkgs/applications/office/scribus')
| -rw-r--r-- | pkgs/applications/office/scribus/poppler-0.73.0.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 2 |
2 files changed, 14 insertions, 0 deletions
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 000000000000..d8cf14b48c2a --- /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 <poppler/goo/gtypes.h> ++#include <poppler/goo/gfile.h> + #include <poppler/Object.h> + #include <poppler/OutputDev.h> + #include <poppler/Gfx.h> diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index aef988964be3..f8bd244e039b 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1"; }; + patches = [ ./poppler-0.73.0.patch ]; + enableParallelBuilding = true; buildInputs = [ |