From ed57af85a7c39eeec57c8599c6cdf0f66509b98f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 16 Nov 2008 12:35:59 +0000
Subject: [PATCH] Maybe it was Boost 1.37.0 that broke OO.o ?

svn path=/nixpkgs/trunk/; revision=13307
---
 pkgs/top-level/all-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2db2290686..0ecc22b7cf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2638,9 +2638,10 @@ let
     inherit fetchurl stdenv;
   };
 
-  boost = selectVersion ../development/libraries/boost "1.37.0" {
+  boostVersionChoice = version: selectVersion ../development/libraries/boost version {
     inherit fetchurl stdenv icu expat zlib bzip2 python;
   };
+  boost = boostVersionChoice "1.37.0";
 
   buddy = import ../development/libraries/buddy {
     inherit fetchurl stdenv;
@@ -7621,8 +7622,9 @@ let
       perl perlArchiveZip perlCompressZlib zlib libjpeg
       expat pkgconfig freetype fontconfig libwpd libxml2
       db4 sablotron curl libsndfile flex zip unzip libmspack
-      getopt file neon cairo which icu boost jdk ant hsqldb
+      getopt file neon cairo which icu jdk ant hsqldb
       cups openssl bison;
+    boost = boostVersionChoice "1.36.0";
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
   };