diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
commit | 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch) | |
tree | 631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/development/libraries/boost | |
parent | c34932ef86628b8b30284882d8baaef4c56320dd (diff) | |
parent | a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff) | |
download | nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2 nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip |
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts: pkgs/tools/security/gnupg/default.nix
Diffstat (limited to 'pkgs/development/libraries/boost')
-rw-r--r-- | pkgs/development/libraries/boost/1.55.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.56.nix | 146 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/header-only-wrapper.nix | 30 |
3 files changed, 148 insertions, 32 deletions
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index cdbf98f4483..2c02ce13e8d 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -40,7 +40,7 @@ let withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}"; in -stdenv.mkDerivation { +let res = stdenv.mkDerivation { name = "boost-1.55.0"; meta = { @@ -98,4 +98,4 @@ stdenv.mkDerivation { ./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 ''; }; -} +}; in res // { lib = res; } diff --git a/pkgs/development/libraries/boost/1.56.nix b/pkgs/development/libraries/boost/1.56.nix new file mode 100644 index 00000000000..212b6ca0dee --- /dev/null +++ b/pkgs/development/libraries/boost/1.56.nix @@ -0,0 +1,146 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames +, toolset ? null +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +# We must build at least one type of libraries +assert !enableShared -> enableStatic; + +with stdenv.lib; +let + + variant = concatStringsSep "," + (optional enableRelease "release" ++ + optional enableDebug "debug"); + + threading = concatStringsSep "," + (optional enableSingleThreaded "single" ++ + optional enableMultiThreaded "multi"); + + link = concatStringsSep "," + (optional enableShared "shared" ++ + optional enableStatic "static"); + + runtime-link = if enableShared then "shared" else "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 + ""; + + withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; + + genericB2Flags = [ + "--prefix=$out" + "--libdir=$lib/lib" + "-j$NIX_BUILD_CORES" + "--layout=${layout}" + "variant=${variant}" + "threading=${threading}" + "runtime-link=${runtime-link}" + "link=${link}" + "${cflags}" + ] ++ optional (variant == "release") "debug-symbols=off"; + + nativeB2Flags = [ + "-sEXPAT_INCLUDE=${expat}/include" + "-sEXPAT_LIBPATH=${expat}/lib" + ] ++ optional (toolset != null) "toolset=${toolset}"; + nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); + + crossB2Flags = [ + "-sEXPAT_INCLUDE=${expat.crossDrv}/include" + "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" + "--user-config=user-config.jam" + "toolset=gcc-cross" + "--without-python" + ]; + crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags); + + builder = b2Args: '' + ./b2 ${b2Args} + ''; + + installer = b2Args: '' + # boostbook is needed by some applications + mkdir -p $out/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/ + + # Let boost install everything else + ./b2 ${b2Args} install + ''; + + commonConfigureFlags = [ + "--libdir=$(lib)/lib" + ]; +in + +stdenv.mkDerivation { + name = "boost-1.56.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Collection of C++ libraries"; + license = "boost-license"; + + platforms = platforms.unix; + maintainers = with maintainers; [ simons wkennington ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2"; + sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; + }; + + enableParallelBuilding = true; + + buildInputs = [ icu expat zlib bzip2 python ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + configureScript = "./bootstrap.sh"; + configureFlags = commonConfigureFlags ++ [ + "--with-icu=${icu}" + "--with-python=${python}/bin/python" + ] ++ optional (toolset != null) "--with-toolset=${toolset}"; + + buildPhase = '' + ${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"} + '' + builder nativeB2Args; + + installPhase = installer nativeB2Args; + + outputs = [ "out" "lib" ]; + + 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 ${concatStringsSep " " commonConfigureFlags}" + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ''; + buildPhase = builder crossB2Args; + installPhase = installer crossB2Args; + }; +} diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix deleted file mode 100644 index 96c9216a371..00000000000 --- a/pkgs/development/libraries/boost/header-only-wrapper.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, boost }: - -let - version = stdenv.lib.removePrefix "boost-" boost.name; - pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name; -in - -stdenv.mkDerivation { - name = "boost-headers-${version}"; - - src = boost.src; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost - ''; - - preferLocalBuild = true; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; - }; -} |