mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 18:12:46 +00:00
Code Issues Wiki Activity

Merge pull request #33382 from LnL7/darwin-cmake-outputs

Browse source 
cmake: fix hook for multiple outputs on darwin
This commit is contained in:
Daiderd Jordan 2018-01-07 09:46:58 +01:00 committed by GitHub
parent e66a5f8862 dc2ae3aef6
commit 84f9736014
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View file

@ -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"

4
pkgs/tools/compression/brotli/default.nix
View file

@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
prePatch = "rm BUILD";
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib")
'';
meta = with stdenv.lib; {
inherit (src.meta) homepage;