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

boost: correct the install names for darwin

Browse Source 
This also makes the recent change for ledger unnecessary.
This commit is contained in:
John Wiegley 2014-11-04 02:28:03 -06:00
parent 52017df966
commit a4ee94b741
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/office/ledger/3.0.nix
View File

@ -23,11 +23,6 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
mkdir -p $out/share/emacs/site-lisp/ mkdir -p $out/share/emacs/site-lisp/
cp -v "$src/lisp/"*.el $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 = { meta = {

5
pkgs/development/libraries/boost/generic.nix
View File

@ -118,8 +118,13 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" 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; enableParallelBuilding = true;
buildInputs = [ icu expat zlib bzip2 python ] buildInputs = [ icu expat zlib bzip2 python ]