Maybe it was Boost 1.37.0 that broke OO.o ?

svn path=/nixpkgs/trunk/; revision=13307
This commit is contained in:
Michael Raskin 2008-11-16 12:35:59 +00:00
parent a0604dd47b
commit ed57af85a7

View File

@ -2638,9 +2638,10 @@ let
inherit fetchurl stdenv; 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; inherit fetchurl stdenv icu expat zlib bzip2 python;
}; };
boost = boostVersionChoice "1.37.0";
buddy = import ../development/libraries/buddy { buddy = import ../development/libraries/buddy {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -7621,8 +7622,9 @@ let
perl perlArchiveZip perlCompressZlib zlib libjpeg perl perlArchiveZip perlCompressZlib zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2 expat pkgconfig freetype fontconfig libwpd libxml2
db4 sablotron curl libsndfile flex zip unzip libmspack 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; cups openssl bison;
boost = boostVersionChoice "1.36.0";
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
}; };