dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "boost: Quick eval fix"

Browse Source 
This reverts commit eb3794186c.
This commit is contained in:
William A. Kennington III 2014-10-08 14:13:01 -07:00
parent 9b61ab1823
commit ecfc1a7fc3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/boost/1.55.nix
View File

@ -40,7 +40,7 @@ let
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
in
let res = stdenv.mkDerivation {
stdenv.mkDerivation {
name = "boost-1.55.0";
meta = {
@ -59,6 +59,8 @@ let res = stdenv.mkDerivation {
enableParallelBuilding = true;
outputs = [ "out" "lib" ];
buildInputs =
[ icu expat zlib bzip2 python ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
@ -96,4 +98,4 @@ let res = 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; }
}