From a268963eec4e10f6d4d2da55a9cd0fdf31553d9b Mon Sep 17 00:00:00 2001
From: Wouter den Breejen <uu@denbreejen.net>
Date: Wed, 18 Jul 2007 16:46:46 +0000
Subject: [PATCH] Worked on openoffice
svn path=/nixpkgs/trunk/; revision=8999
---
pkgs/top-level/all-packages.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 294d1b460ef9..8f730a713a4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3049,10 +3049,11 @@ rec {
getopt file neon;
inherit (xlibs) libXaw;
inherit (gtkLibs) gtk;
-
bison = bison23;
+ inherit jre;
+ stdenv = overrideGCC stdenv gcc34;
};
-
+
opera = import ../applications/networking/browsers/opera {
inherit fetchurl stdenv zlib;
inherit (xlibs) libX11 libSM libICE libXt libXext;