diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f2379220a65..cf708da62a9 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -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 " > 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" ''; diff --git a/pkgs/applications/graphics/inkscape/gtk-clist.patch b/pkgs/applications/graphics/inkscape/gtk-clist.patch new file mode 100644 index 00000000000..6518538fcc1 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/gtk-clist.patch @@ -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 +-#include ++#include + #include "../xml/repr.h" + + #include