boost: correct the install names for darwin

This also makes the recent change for ledger unnecessary.
wip/yesman
John Wiegley 10 years ago
parent 52017df966
commit a4ee94b741
  1. 5
      pkgs/applications/office/ledger/3.0.nix
  2. 5
      pkgs/development/libraries/boost/generic.nix

@ -23,11 +23,6 @@ stdenv.mkDerivation {
postInstall = ''
mkdir -p $out/share/emacs/site-lisp/
cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/
'' + stdenv.lib.optionalString stdenv.isDarwin ''
for i in date_time filesystem system iostreams regex unit_test_framework; do
boostlib=libboost_''$i.dylib
install_name_tool -change ''$boostlib ${boost}/lib/''$boostlib $out/bin/ledger
done
'';
meta = {

@ -118,8 +118,13 @@ stdenv.mkDerivation {
preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
substituteInPlace tools/build/src/tools/clang-darwin.jam \
--replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"
'';
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin
"-headerpad_max_install_names";
enableParallelBuilding = true;
buildInputs = [ icu expat zlib bzip2 python ]

Loading…
Cancel
Save