diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-11-06 15:43:37 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-11-06 15:43:54 -0500 |
| commit | 81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6 (patch) | |
| tree | 2b8e77b38af6c8ca35b44c235fbfdb491bdf96ab /pkgs/applications/graphics/inkscape/default.nix | |
| parent | 97dbf112b45928ddeff205f0fadb64f9210bf7c6 (diff) | |
| download | nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar.gz nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar.bz2 nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar.lz nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar.xz nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.tar.zst nixpkgs-81f6fbdb0a9a54655e6e8d6fac830c7f59e733b6.zip | |
inkscape: add compatibility with poppler 0.76.0+
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index e3fa897aec6..17b5a716491 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perlPackages, libXft +{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p"; }; + patches = [ + (fetchpatch { + name = "inkscape-poppler_0_76_compat.patch"; + url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff"; + sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf"; + }) + ]; + # Inkscape hits the ARGMAX when linking on macOS. It appears to be # CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS. # Setting strictDeps it avoids duplicating some dependencies so it |