summary refs log tree commit diff
path: root/pkgs/applications/graphics/inkscape/default.nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-01-26 18:51:52 +0000
committerLudovic Courtès <ludo@gnu.org>2009-01-26 18:51:52 +0000
commit730fe26fa002e34451d1c4a99a2e38e860f81033 (patch)
tree10bcf1a9b1b2aca677c8621a3e6505f24a347a17 /pkgs/applications/graphics/inkscape/default.nix
parentc333a6ab6b25c1f7759ed54a0d86ebc393e62062 (diff)
downloadnixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar.gz
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar.bz2
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar.lz
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar.xz
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.tar.zst
nixpkgs-730fe26fa002e34451d1c4a99a2e38e860f81033.zip
Inkscape: Work around libpng's unhappiness.
svn path=/nixpkgs/trunk/; revision=13873
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 1f8bff4db9b..33defc0bea4 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -8,10 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
   };
 
-  # Work around Python misdetection and set `PYTHON_LIBS' to
-  # "-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
-  # Changed to 2.5
-  patches = [ ./configure-python-libs.patch ];
+  patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ]; 
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from