From 2192ddec0ed35f8851b865db574fe6c141343c4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Nov 2013 22:08:30 +0100 Subject: [PATCH] boost: say hello to version 1.55.0 --- pkgs/development/libraries/boost/1.55.nix | 91 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.55.nix diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix new file mode 100644 index 00000000000..3ae54c22be3 --- /dev/null +++ b/pkgs/development/libraries/boost/1.55.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if enablePIC && enableExceptions then + "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" + else if enablePIC then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if enableExceptions then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.55.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; + sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52a6ef0764a..c2e4081fc98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3880,7 +3880,8 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost154 = callPackage ../development/libraries/boost/1.54.nix { }; - boost = boost154; + boost155 = callPackage ../development/libraries/boost/1.55.nix { }; + boost = boost155; boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };