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

Revert "boost155: specify lib dir for lib output"

Browse Source 
This reverts commit e640935da6.
This commit is contained in:
Domen Kožar 2014-09-23 16:00:30 +02:00
parent e640935da6
commit 9fe2ac79af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ let res = stdenv.mkDerivation {
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
configureScript = "./bootstrap.sh"; configureScript = "./bootstrap.sh";
configureFlags = "--libdir=$lib/lib --with-icu=${icu} --with-python=${python}/bin/python" + withToolset; configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset;
buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}"; buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}";
@ -72,7 +72,7 @@ let res = stdenv.mkDerivation {
installPhase = '' installPhase = ''
cd tools/build/v2 cd tools/build/v2
sh bootstrap.sh${withToolset} sh bootstrap.sh${withToolset}
./b2 -j$NIX_BUILD_CORES --libdir=$lib/lib -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset} ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
rm $out/bin/bjam rm $out/bin/bjam
ln -s $out/bin/b2 $out/bin/bjam ln -s $out/bin/b2 $out/bin/bjam
rm -rf $out/share/boost-build/example rm -rf $out/share/boost-build/example