boost: updated to 1.35.0 and added selectVersion dispatcher
svn path=/nixpkgs/trunk/; revision=12207
This commit is contained in:
parent
e1f4d60dca
commit
6c58c97f3a
|
@ -1,4 +1,6 @@
|
|||
{stdenv, fetchurl, icu, zlib, bzip2, python}:
|
||||
{stdenv, fetchurl, icu, zlib, bzip2, python, version}:
|
||||
|
||||
assert version == "1.34.1";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "boost-1.34.1";
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchurl, icu, zlib, bzip2, python, version}:
|
||||
|
||||
assert version == "1.35.0";
|
||||
|
||||
stdenv.mkDerivation
|
||||
{
|
||||
name = "boost-1.35.0";
|
||||
meta =
|
||||
{
|
||||
homepage = "http://boost.org/";
|
||||
description = "Boost C++ Library Collection";
|
||||
license = "boost-license";
|
||||
};
|
||||
src = fetchurl
|
||||
{
|
||||
url = "mirror://sourceforge/boost/boost_1_35_0.tar.bz2";
|
||||
sha256 = "f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da";
|
||||
};
|
||||
buildInputs = [icu zlib bzip2 python];
|
||||
|
||||
preConfigure = "
|
||||
sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure
|
||||
";
|
||||
|
||||
configureFlags = "--with-icu=${icu} --with-python=${python}";
|
||||
}
|
|
@ -2378,7 +2378,7 @@ let pkgs = rec {
|
|||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
boost = import ../development/libraries/boost {
|
||||
boost = selectVersion ../development/libraries/boost "1.35.0" {
|
||||
inherit fetchurl stdenv icu zlib bzip2 python;
|
||||
};
|
||||
|
||||
|
@ -2606,7 +2606,7 @@ let pkgs = rec {
|
|||
''
|
||||
ensureDir $out
|
||||
ln -s $glibc64/* $out/
|
||||
|
||||
|
||||
rm $out/lib $out/lib64
|
||||
ensureDir $out/lib
|
||||
ln -s $glibc64/lib/* $out/lib
|
||||
|
|
Loading…
Reference in New Issue