alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

inkscape: Clean up and update to version 0.91.

Browse source 
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 , to be
sure we don't regress here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-02-22 08:14:53 +01:00
parent 030895f075
commit 7cd6dd9ada
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 13 additions and 15 deletions

28
pkgs/applications/graphics/inkscape/default.nix
View file

@ -1,20 +1,22 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , 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 { stdenv.mkDerivation rec {
name = "inkscape-0.48.5"; name = "inkscape-0.91";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; url = "https://inkscape.global.ssl.fastly.net/media/resources/file/"
sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b"; + "${name}.tar.bz2";
sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d";
}; };
patches = [ ./configure-python-libs.patch ]; postPatch = ''
patchShebangs share/extensions
postPatch = stdenv.lib.optionalString doCheck '';
''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp'';
propagatedBuildInputs = [ propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from # Python is used at run-time to execute scripts, e.g., those from
@ -25,14 +27,12 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext 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; enableParallelBuilding = true;
doCheck = true; doCheck = true;
checkFlags = "-j1";
postInstall = '' postInstall = ''
# Make sure PyXML modules can be found at run-time. # Make sure PyXML modules can be found at run-time.
@ -43,11 +43,9 @@ stdenv.mkDerivation rec {
--prefix PATH : ${python}/bin || \ --prefix PATH : ${python}/bin || \
exit 2 exit 2
done done
rm $out/share/icons/hicolor/icon-theme.cache rm "$out/share/icons/hicolor/icon-theme.cache"
''; '';
NIX_LDFLAGS = "-lX11";
meta = with stdenv.lib; { meta = with stdenv.lib; {
license = "GPL"; license = "GPL";
homepage = http://www.inkscape.org; homepage = http://www.inkscape.org;