BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv

Browse source 
This was initially introduced in 92188d9d17,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
This commit is contained in:
Daiderd Jordan 2020-01-14 12:43:54 +01:00
parent b984c227d2
commit 68513e4071
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,9 @@ cmakeConfigurePhase() {
# because we usually do not package the framework # 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"
# we never want to use the global macOS SDK # we never want to use the global macOS SDK
cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"

1
pkgs/stdenv/darwin/default.nix
View file

@ -34,7 +34,6 @@ in rec {
export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1}
export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1}
export NIX_IGNORE_LD_THROUGH_GCC=1 export NIX_IGNORE_LD_THROUGH_GCC=1
export CMAKE_OSX_ARCHITECTURES=x86_64
export SDKROOT= export SDKROOT=
# Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.