From 05eb6625ed653a832a087caaddcb5a228dfeba3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Feb 2009 10:02:10 +0000 Subject: [PATCH] Bumped boost libraries to version 1.38.0. svn path=/nixpkgs/trunk/; revision=14031 --- pkgs/development/libraries/boost/1.38.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.38.0.nix diff --git a/pkgs/development/libraries/boost/1.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix new file mode 100644 index 00000000000..10058386c50 --- /dev/null +++ b/pkgs/development/libraries/boost/1.38.0.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }: + +assert version == "1.38.0"; + +stdenv.mkDerivation { + name = "boost-1.38.0"; + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + }; + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2"; + sha256 = "1bs3b11y66xkdqjl38xb20hipx0pjr0h72fj6755655j6b4kz37z"; + }; + 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 af965079711..cc86a16b029 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2670,7 +2670,7 @@ let boostVersionChoice = version: selectVersion ../development/libraries/boost version { inherit fetchurl stdenv icu expat zlib bzip2 python; }; - boost = boostVersionChoice "1.37.0"; + boost = boostVersionChoice "1.38.0"; buddy = import ../development/libraries/buddy { inherit fetchurl stdenv; @@ -7705,7 +7705,7 @@ let }; mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) { - inherit firefox; + inherit firefox; inherit (xlibs) libX11 xproto; };