diff options
| author | Domen Kožar <domen@dev.si> | 2014-09-23 15:54:47 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-09-23 15:59:14 +0200 |
| commit | e640935da6052547faaa8fe7d63bd8774de9f45c (patch) | |
| tree | 3668f5d1fefaf79da16e446bf2829b6f40f891a4 /pkgs/development/libraries/boost/1.55.nix | |
| parent | 91fa55e70211b4d7630e0b4ecc8bd1dee68db9d7 (diff) | |
| download | nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar.gz nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar.bz2 nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar.lz nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar.xz nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.tar.zst nixpkgs-e640935da6052547faaa8fe7d63bd8774de9f45c.zip | |
boost155: specify lib dir for lib output
Diffstat (limited to 'pkgs/development/libraries/boost/1.55.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/1.55.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 31469b3e06c..442b7e62152 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 |