From 0ee3317bc5042757ad64051080e3b3f8187ac81e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Aug 2008 10:00:46 +0000
Subject: [PATCH] boost: added version 1.36.0

Also added support for expat library (used by the graph library). This package
should probably be built on the compile farm because it takes quite a while to
complete, even on a fast machine. Having pre-built binaries would be very nice.

svn path=/nixpkgs/trunk/; revision=12702
---
 pkgs/development/libraries/boost/1.36.0.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/boost/1.36.0.nix

diff --git a/pkgs/development/libraries/boost/1.36.0.nix b/pkgs/development/libraries/boost/1.36.0.nix
new file mode 100644
index 000000000000..11e600e65f39
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.36.0.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }:
+
+assert version == "1.36.0";
+
+stdenv.mkDerivation {
+  name = "boost-1.36.0";
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+  };
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_36_0.tar.bz2";
+    sha256 = "1vydzfvzg0fkzixkr2jikvcc0zbh5qgw98hr6nhj0z12ppxhqjls";
+  };
+  buildInputs = [icu expat zlib bzip2 python];
+  preConfigure =
+    "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure";
+  configureFlags = "--with-icu=${icu} --with-python=${python}";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12a123dda38d..e1f1aac970ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2519,8 +2519,8 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  boost = selectVersion ../development/libraries/boost "1.35.0" {
-    inherit fetchurl stdenv icu zlib bzip2 python;
+  boost = selectVersion ../development/libraries/boost "1.36.0" {
+    inherit fetchurl stdenv icu expat zlib bzip2 python;
   };
 
   buddy = import ../development/libraries/buddy {