From 23477c16e7cf8c4b0834653415afe62493e3f0e2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 8 Dec 2007 01:10:05 +0000
Subject: [PATCH] Using the current gcc inkscape still builds and runs on i686
 but also builds on my x86_64

svn path=/nixpkgs/branches/stdenv-updates/; revision=9891
---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57e55346aa1..984d8b2ee08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3700,12 +3700,11 @@ rec {
   } null;
 
   inkscape = import ../applications/graphics/inkscape {
-    inherit fetchurl perl perlXMLParser pkgconfig zlib
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
       popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
       glibmm libsigcxx lcms boost gettext;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXft;
-    stdenv = overrideGCC stdenv gcc34;
   };
 
   ion3 = import ../applications/window-managers/ion-3 {