Unverified Commit 7cd6dd9a authored by aszlig's avatar aszlig
Browse files

inkscape: Clean up and update to version 0.91. 



This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.

Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.

Tests now seem to run fine without -j1 as well.

I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.

Signed-off-by: default avataraszlig <aszlig@redmoonstudios.org>
parent 030895f0

pkgs/applications/graphics/inkscape/default.nix

+13 −15
Original line number Diff line number Diff line 
{ 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

  '';



  propagatedBuildInputs = [

    # Python is used at run-time to execute scripts, e.g., those from
@@ -25,14 +27,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 +43,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;