From 6dfc121001334d1a635b693ce300f37dd7052dc2 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 26 Oct 2005 21:52:41 +0000
Subject: [PATCH] OOo2 needs a newer version of bison than we used before. Use
 2.1 now.

svn path=/nixpkgs/trunk/; revision=4151
---
 pkgs/system/all-packages-generic.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 2231a6ea25b4..d30dc1b7b4fe 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1420,9 +1420,15 @@ rec {
   ### APPLICATIONS
 
   openoffice = (import ../applications/office/openoffice) {
-    inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon bison flex zip libmspack getopt;
+    inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile neon flex zip libmspack getopt;
     inherit (xlibs) libXaw fontconfig;
     inherit (gtkLibs) gtk;
+
+    bison = (import ../development/tools/parsing/bison/bison-2.1.nix) {
+      inherit fetchurl stdenv;
+      m4 = gnum4;
+    };
+
   };
 
   cvs = (import ../applications/version-management/cvs) {