diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-01-14 12:43:54 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2020-01-31 21:52:13 +0100 |
| commit | 68513e40711cd942144a1da9c9e434b378c2c762 (patch) | |
| tree | 6b22b95196617d7cbdaf2684769ba9fca1a1be8e /pkgs/stdenv | |
| parent | b984c227d28c0af7b1afaace0c2ad107d94757f6 (diff) | |
| download | nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar.gz nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar.bz2 nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar.lz nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar.xz nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.tar.zst nixpkgs-68513e40711cd942144a1da9c9e434b378c2c762.zip | |
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv
This was initially introduced in 92188d9d1751892ddbf8913da73dfc150d18fadb, not clear how relevant this still is but i686 isn't supported anymore so disable it explicitly.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 7a9c20fd6a7..4f91d18a376 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -34,7 +34,6 @@ in rec { export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1} export NIX_IGNORE_LD_THROUGH_GCC=1 - export CMAKE_OSX_ARCHITECTURES=x86_64 export SDKROOT= # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. |