diff options
| author | Domen Kožar <domen@dev.si> | 2014-09-23 16:00:30 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-09-23 16:00:30 +0200 |
| commit | 9fe2ac79af435aea311f95b64092b89ab3724ad3 (patch) | |
| tree | 1251e1061df34a01ec610e0e156624bc3ac258d1 /pkgs/development/libraries/boost/1.55.nix | |
| parent | e640935da6052547faaa8fe7d63bd8774de9f45c (diff) | |
| download | nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar.gz nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar.bz2 nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar.lz nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar.xz nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.tar.zst nixpkgs-9fe2ac79af435aea311f95b64092b89ab3724ad3.zip | |
Revert "boost155: specify lib dir for lib output"
This reverts commit e640935da6052547faaa8fe7d63bd8774de9f45c.
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 442b7e62152..31469b3e06c 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 = "--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}"; @@ -72,7 +72,7 @@ let res = stdenv.mkDerivation { installPhase = '' cd tools/build/v2 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 ln -s $out/bin/b2 $out/bin/bjam rm -rf $out/share/boost-build/example |