Make Inkscape properly depend on Python, which is needed for some features.

svn path=/nixpkgs/trunk/; revision=10836
This commit is contained in:
Ludovic Courtès 2008-02-22 16:24:58 +00:00
parent c18141227f
commit c800565c73
3 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- inkscape-0.45.1/configure 2007-03-20 14:56:43.000000000 +0100
+++ inkscape-0.45.1/configure 2008-02-22 16:19:10.000000000 +0100
@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then
if test "$?" -gt "0"; then
with_python="no"
else
- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+ checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.4 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
if test "$?" -gt "0"; then
with_python="no"
else

View File

@ -8,7 +8,9 @@
glib, glib,
gtkmm, glibmm, libsigcxx, gtkmm, glibmm, libsigcxx,
boost, boost,
gettext gettext,
python, pyxml,
makeWrapper
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,6 +21,16 @@ stdenv.mkDerivation {
sha256 = "1y0b9bm8chn6a2ip99dj4dhg0188yn67v571ha0x38wrlmvn4k0d"; sha256 = "1y0b9bm8chn6a2ip99dj4dhg0188yn67v571ha0x38wrlmvn4k0d";
}; };
# Work around Python misdetection and set `PYTHON_LIBS' to
# "-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
patches = [ ./configure-python-libs.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
# the "Effects" menu.
python pyxml
];
buildInputs = [ buildInputs = [
pkgconfig pkgconfig
perl perlXMLParser perl perlXMLParser
@ -32,9 +44,27 @@ stdenv.mkDerivation {
lcms lcms
boost boost
gettext gettext
makeWrapper
]; ];
configureFlags = "--with-python";
postInstall = ''
# Make sure PyXML modules can be found at run-time.
for i in "$out/bin/"*
do
# FIXME: We're assuming Python 2.4.
wrapProgram "$i" --prefix PYTHONPATH : \
"${pyxml}/lib/python2.4/site-packages" || \
exit 2
done
'';
meta = { meta = {
license = "GPL";
homepage = http://www.inkscape.org; homepage = http://www.inkscape.org;
description = ''Inkscape is a feature-rich vector graphics editor
that edits files in the W3C SVG (Scalable Vector
Graphics) file format.'';
}; };
} }

View File

@ -4919,7 +4919,8 @@ rec {
inkscape = import ../applications/graphics/inkscape { inkscape = import ../applications/graphics/inkscape {
inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
popt libxml2 libxslt libpng boehmgc fontconfig gtkmm popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
glibmm libsigcxx lcms boost gettext; glibmm libsigcxx lcms boost gettext
python pyxml makeWrapper;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (xlibs) libXft; inherit (xlibs) libXft;
}; };