From e640935da6052547faaa8fe7d63bd8774de9f45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 23 Sep 2014 15:54:47 +0200 Subject: [PATCH] boost155: specify lib dir for lib output --- pkgs/development/libraries/boost/1.55.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 31469b3e06c5..442b7e62152a 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -64,7 +64,7 @@ let res = stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset; + configureFlags = "--libdir=$lib/lib --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}"; @@ -72,7 +72,7 @@ let res = stdenv.mkDerivation { installPhase = '' cd tools/build/v2 sh bootstrap.sh${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} + ./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} rm $out/bin/bjam ln -s $out/bin/b2 $out/bin/bjam rm -rf $out/share/boost-build/example