diff options
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/cairomm/default.nix | 9 |
2 files changed, 15 insertions, 6 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; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 9953f283924e..fbf3cd57e3b9 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; ver_min = "0"; @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo libsigcxx ]; - buildInputs = [ fontconfig freetype ]; + buildInputs = [ fontconfig freetype ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + ]); doCheck = true; @@ -35,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; license = with licenses; [ lgpl2Plus mpl10 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |