diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-08-25 18:14:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 18:14:42 -0400 |
| commit | 355cc312294a6962b777f410673acd1824ddcfc2 (patch) | |
| tree | 9c8f611eb7c5c3731d65f345f1951ddf04999eaf /pkgs/applications | |
| parent | 78305bc5a14e2f1651221cd5f6871602573c2873 (diff) | |
| parent | 42701ee33e457af11ced7826ac7032b42842f23d (diff) | |
| download | nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar.gz nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar.bz2 nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar.lz nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar.xz nixlib-355cc312294a6962b777f410673acd1824ddcfc2.tar.zst nixlib-355cc312294a6962b777f410673acd1824ddcfc2.zip | |
Merge pull request #17962 from vbgl/inkscape-darwin
inkscape: fix on darwin (fixes #15768)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index e009676f2f19..25cf3a990d11 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, unzip +, libvisio, libcdr, libexif, unzip, automake114x, autoconf , boxMakerPlugin ? false # boxmaker plugin }: @@ -14,6 +14,11 @@ boxmaker = fetchurl { sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; }; +stdcxx-patch = fetchpatch { + url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3; + sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y"; +}; + in stdenv.mkDerivation rec { @@ -28,6 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./deprecated-scopedptr.patch ]; postPatch = '' + patch -i ${stdcxx-patch} -p 0 patchShebangs share/extensions '' # Clang gets misdetected, so hardcode the right answer @@ -46,7 +52,7 @@ stdenv.mkDerivation rec { pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif + libvisio libcdr libexif automake114x autoconf ] ++ stdenv.lib.optional boxMakerPlugin unzip; enableParallelBuilding = true; |