diff options
Diffstat (limited to 'pkgs/development/libraries/boost/1.49.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/1.49.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index a86670927aad..e0ba0630cd06 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -29,11 +29,11 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; @@ -57,7 +57,7 @@ stdenv.mkDerivation { }; # See <http://svn.boost.org/trac/boost/ticket/4688>. - patches = [ ./boost_filesystem_post_1_49_0.patch ]; + patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ]; enableParallelBuilding = true; @@ -71,7 +71,7 @@ stdenv.mkDerivation { installPhase = ":"; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -85,7 +85,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } |