diff options
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 38ceefa4523..ca52a4f2766 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,20 +1,27 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: +, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, libvisio, libcdr, libexif +}: stdenv.mkDerivation rec { - name = "inkscape-0.48.5"; + name = "inkscape-0.91"; src = fetchurl { - url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b"; + url = "https://inkscape.global.ssl.fastly.net/media/resources/file/" + + "${name}.tar.bz2"; + sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; }; - patches = [ ./configure-python-libs.patch ]; - - postPatch = stdenv.lib.optionalString doCheck - ''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp''; + postPatch = '' + patchShebangs share/extensions + '' + # Clang gets misdetected, so hardcode the right answer + + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace src/ui/tool/node.h \ + --replace "#if __cplusplus >= 201103L" "#if true" + ''; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -25,14 +32,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler imagemagick libwpg + makeWrapper intltool gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif ]; - configureFlags = "--with-python"; - enableParallelBuilding = true; doCheck = true; - checkFlags = "-j1"; postInstall = '' # Make sure PyXML modules can be found at run-time. @@ -43,11 +48,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${python}/bin || \ exit 2 done - rm $out/share/icons/hicolor/icon-theme.cache + rm "$out/share/icons/hicolor/icon-theme.cache" ''; - NIX_LDFLAGS = "-lX11"; - meta = with stdenv.lib; { license = "GPL"; homepage = http://www.inkscape.org; |