diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-04 01:00:48 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-04 01:00:48 -0800 |
| commit | 4251612faa3e1311c72b382539febc7892f59c77 (patch) | |
| tree | d6d939a7aaebc5e8255fc257464aa1abef3da5af /pkgs/development/libraries/boost | |
| parent | b983c6b9b5ffa9c1d5e8c4fffe39abda6c2420df (diff) | |
| parent | 86ba275a99908a30f5139d5e605d0ac1f5d3ea7b (diff) | |
| download | nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.gz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.bz2 nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.lz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.xz nixlib-4251612faa3e1311c72b382539febc7892f59c77.tar.zst nixlib-4251612faa3e1311c72b382539febc7892f59c77.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index cd98c0a312be..2a83d7c4142d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation { NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" 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=)"; + --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' cat << EOF > user-config.jam |