diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-08-24 15:14:11 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-08-25 15:39:53 +0200 |
| commit | 42701ee33e457af11ced7826ac7032b42842f23d (patch) | |
| tree | e42d2900c6f025b0b6ad4699e20f9539039243e5 /pkgs/applications/graphics/inkscape/default.nix | |
| parent | b4b244de2a794d296c78d4717aba796d9a169ecd (diff) | |
| download | nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar.gz nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar.bz2 nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar.lz nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar.xz nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.tar.zst nixpkgs-42701ee33e457af11ced7826ac7032b42842f23d.zip | |
inkscape: fix on darwin
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
| -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 e009676f2f1..25cf3a990d1 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; |