From 6930efd1e592c9cc2915863f0a7122da8362f083 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Jan 2013 18:04:52 +0100
Subject: [PATCH] openjade: Use default gcc

---
 pkgs/tools/text/sgml/openjade/default.nix | 15 ++++++---------
 pkgs/top-level/all-packages.nix           |  5 +----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix
index 77532fd216c..fc7ee9f6f06 100644
--- a/pkgs/tools/text/sgml/openjade/default.nix
+++ b/pkgs/tools/text/sgml/openjade/default.nix
@@ -1,22 +1,19 @@
-{stdenv, fetchurl, opensp, perl}:
+{ stdenv, fetchurl, opensp, perl }:
 
-stdenv.mkDerivation {
-  # OpenJade-1.3.2 requires gcc 3.3 to build.  
-  # The next release is likely to be compatible with newer gccs.
-  # If so the overrideGCC in top-level/all-packages should be removed.
-  name = "OpenJade-1.3.2";
+stdenv.mkDerivation rec {
+  name = "openjade-1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz";
+    url = "mirror://sourceforge/openjade/${name}.tar.gz";
     sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
   };
 
-  buildInputs = [opensp perl];
+  buildInputs = [ opensp perl ];
 
   configureFlags = [
     "--enable-spincludedir=${opensp}/include/OpenSP"
     "--enable-splibdir=${opensp}/lib"
-  ]; 
+  ];
 
   meta = {
     description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f78b3d8669e..38df8c28fbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1242,10 +1242,7 @@ let
 
   opendkim = callPackage ../development/libraries/opendkim { };
 
-  openjade = callPackage ../tools/text/sgml/openjade {
-    stdenv = overrideGCC stdenv gcc33;
-    opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; };
-  };
+  openjade = callPackage ../tools/text/sgml/openjade { };
 
   openobex = callPackage ../tools/bluetooth/openobex { };