lol

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

cmake: fix hook for multiple outputs on darwin

authored by

Daiderd Jordan and committed by
GitHub
84f97360 e66a5f88

+1 -5
+1 -1
pkgs/development/tools/build-managers/cmake/setup-hook.sh
··· 43 43 # libraries are in a system path or in the same directory as the 44 44 # executable. This flag makes the shared library accessible from its 45 45 # nix/store directory. 46 - cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=$prefix/lib $cmakeFlags" 46 + cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" 47 47 cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" 48 48 cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" 49 49
-4
pkgs/tools/compression/brotli/default.nix
··· 21 21 # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) 22 22 prePatch = "rm BUILD"; 23 23 24 - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' 25 - cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib") 26 - ''; 27 - 28 24 meta = with stdenv.lib; { 29 25 inherit (src.meta) homepage; 30 26