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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-07-30 18:28:15 +02:00
parent 5d6aa8b496 ca63714c0f
commit cee7df4846
180 changed files with 1011 additions and 920 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"