public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"

Browse Source 
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
This commit is contained in:
Matthew Bauer
2020-07-29 18:20:56 -05:00
parent e36b1d4ad1
commit 22f82fc8ca
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ cmakeConfigurePhase() {
# on macOS we want to prefer Unix-style headers to Frameworks
# because we usually do not package the framework
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags"
# on macOS i686 was only relevant for 10.5 or earlier.
cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"