diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-04 15:21:33 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-04 15:21:33 +0300 |
| commit | 18ac683bbcfe60fd2dabf747903f33338326d294 (patch) | |
| tree | 9ffccda8252fd63b459608e49583a9582711dfa2 /pkgs | |
| parent | 0e3a86e14552ca14eed7dda2eb38f3cf2be7f5dd (diff) | |
| download | nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar.gz nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar.bz2 nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar.lz nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar.xz nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.tar.zst nixlib-18ac683bbcfe60fd2dabf747903f33338326d294.zip | |
Fix Boost 1.55 build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 274b2486febe..fdfc8b45a683 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -118,8 +118,10 @@ 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=)" + if test -f tools/build/src/tools/clang-darwin.jam ; then + substituteInPlace tools/build/src/tools/clang-darwin.jam \ + --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + fi; ''; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin |