diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-02-09 15:09:43 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:46 -0400 |
| commit | 36450d8d0b1fc1ed7c4e625a0267528732d2d83e (patch) | |
| tree | 53797beac156e770918147cce4f5e8480387737c /pkgs/stdenv | |
| parent | f76c7b8fab2f4e5e3866d4dced0f18ceeae562b4 (diff) | |
| download | nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar.gz nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar.bz2 nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar.lz nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar.xz nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.tar.zst nixpkgs-36450d8d0b1fc1ed7c4e625a0267528732d2d83e.zip | |
cctools: enable tapi everywhere
Gets us closer to #19906.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index af74be3a1c6..edbc84b9a68 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -200,7 +200,12 @@ in rec { python2 = self.python; ninja = super.ninja.override { buildDocs = false; }; - darwin = super.darwin // { cctools = super.darwin.cctools.override { llvm = null; }; }; + darwin = super.darwin // { + cctools = super.darwin.cctools.override { + llvm = null; + enableTapiSupport = false; + }; + }; }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; @@ -326,6 +331,7 @@ in rec { darwin = super.darwin // rec { inherit (darwin) dyld Libsystem libiconv locale; + cctools = super.darwin.cctools.override { enableTapiSupport = false; }; libxml2-nopython = super.libxml2.override { pythonSupport = false; }; CF = super.darwin.CF.override { libxml2 = libxml2-nopython; |