From 3f38e45fa43506958a34fcd576900d1e5beaf50b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 29 Oct 2007 22:15:02 +0000
Subject: [PATCH] update inkscape to version 0.45 (I was no longer able to get
 0.43)

svn path=/nixpkgs/trunk/; revision=9554
---
 pkgs/applications/graphics/inkscape/default.nix | 15 ++++++++++-----
 pkgs/top-level/all-packages.nix                 |  5 +++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index d7e53dbd5c1..d09263576e5 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchurl, pkgconfig,
   perl, perlXMLParser,
   gtk, libXft, fontconfig,
-  libpng,
+  libpng, lcms,
   zlib, popt,
   boehmgc,
   libxml2, libxslt,
   glib,
-  gtkmm, glibmm, libsigcxx
+  gtkmm, glibmm, libsigcxx,
+  boost,
+  gettext
 }:
 
 stdenv.mkDerivation {
-  name = "inkscape-0.43";
+  name = "inkscape-0.45";
 
   src = fetchurl {
-    url = mirror://sourceforge/inkscape/inkscape-0.43.tar.bz2;
-    md5 = "97c606182f5e177eef70c1e8a55efc1f";
+    url = mirror://sourceforge/inkscape/inkscape-0.45.1.tar.gz;
+    sha256 = "1y0b9bm8chn6a2ip99dj4dhg0188yn67v571ha0x38wrlmvn4k0d";
   };
 
   buildInputs = [
@@ -27,5 +29,8 @@ stdenv.mkDerivation {
     libxml2 libxslt
     glib
     gtkmm glibmm libsigcxx
+    lcms
+    boost
+    gettext
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f8893be5e5..95969fd40ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3673,11 +3673,12 @@ rec {
   };
 
   inkscape = import ../applications/graphics/inkscape {
-    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
+    inherit fetchurl perl perlXMLParser pkgconfig zlib
       popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
-      glibmm libsigcxx;
+      glibmm libsigcxx lcms boost gettext;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXft;
+    stdenv = overrideGCC stdenv gcc34;
   };
 
   ion3 = import ../applications/window-managers/ion-3 {