inkscape: fix on darwin

+9 -3
+9 -3
pkgs/applications/graphics/inkscape/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft 2 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm 3 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool 4 , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge 5 - , libvisio, libcdr, libexif, unzip 6 , boxMakerPlugin ? false # boxmaker plugin 7 }: 8 ··· 14 sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; 15 }; 16 17 in 18 19 stdenv.mkDerivation rec { ··· 28 patches = [ ./deprecated-scopedptr.patch ]; 29 30 postPatch = '' 31 patchShebangs share/extensions 32 '' 33 # Clang gets misdetected, so hardcode the right answer ··· 46 pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc 47 libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext 48 makeWrapper intltool gsl poppler imagemagick libwpg librevenge 49 - libvisio libcdr libexif 50 ] ++ stdenv.lib.optional boxMakerPlugin unzip; 51 52 enableParallelBuilding = true;
··· 1 + { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft 2 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm 3 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool 4 , gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge 5 + , libvisio, libcdr, libexif, unzip, automake114x, autoconf 6 , boxMakerPlugin ? false # boxmaker plugin 7 }: 8 ··· 14 sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; 15 }; 16 17 + stdcxx-patch = fetchpatch { 18 + url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3; 19 + sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y"; 20 + }; 21 + 22 in 23 24 stdenv.mkDerivation rec { ··· 33 patches = [ ./deprecated-scopedptr.patch ]; 34 35 postPatch = '' 36 + patch -i ${stdcxx-patch} -p 0 37 patchShebangs share/extensions 38 '' 39 # Clang gets misdetected, so hardcode the right answer ··· 52 pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc 53 libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext 54 makeWrapper intltool gsl poppler imagemagick libwpg librevenge 55 + libvisio libcdr libexif automake114x autoconf 56 ] ++ stdenv.lib.optional boxMakerPlugin unzip; 57 58 enableParallelBuilding = true;