diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
| commit | 67c73b4e64b01657ce9ea9bb2d8c015754ef3150 (patch) | |
| tree | 7358277e028232ad5f37da0892ee2bb6860373b5 /pkgs/development/tools/build-managers/cmake/setup-hook.sh | |
| parent | 5ab499d2c753209381e721a66204fe7869d6dac9 (diff) | |
| parent | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (diff) | |
| download | nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.gz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.bz2 nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.lz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.xz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.zst nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.zip | |
Merge commit '2e56ba' from staging into master
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake/setup-hook.sh')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index a92d54b3f144..a0f1cf00814c 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -43,7 +43,7 @@ cmakeConfigurePhase() { # libraries are in a system path or in the same directory as the # executable. This flag makes the shared library accessible from its # nix/store directory. - cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags" + cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" |