mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Fixed inkscape compilation on glibc 2.9

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15168
This commit is contained in:
Sander van der Burg 2009-04-20 11:18:53 +00:00
parent e1cfa22536
commit 205d181222
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0flrjqa68vnnn8lrhj86xpa6h2cyzrvjy6873v9id092f86ix1li";
};
patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ];
patches = [ ./configure-python-libs.patch ./libpng-setjmp.patch ./gtk-clist.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
configureFlags = "--with-python";
# Fix compilation on glibc 2.9 by adding missing string header
preConfigure = ''
echo "#include <string.h>" > tmp.cpp
cat tmp.cpp src/dom/io/uristream.cpp > src/dom/io/uristream.cpp.new
rm tmp.cpp
mv src/dom/io/uristream.cpp.new src/dom/io/uristream.cpp
'';
preBuild = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I./extension/script"
'';

11
pkgs/applications/graphics/inkscape/gtk-clist.patch Normal file
View file

@ -0,0 +1,11 @@
--- inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008/06/07 22:06:52 1.1
+++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008/06/07 22:09:22
@@ -13,7 +13,7 @@
*/
#include <stdio.h>
-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
#include "../xml/repr.h"
#include <glib.h>