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

cctools: enable tapi everywhere

Browse Source 
Gets us closer to #19906.
This commit is contained in:
Matthew Bauer 2019-02-09 15:09:43 -05:00
parent f76c7b8fab
commit 36450d8d0b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -2,7 +2,7 @@
, libcxxabi, libuuid, llvm , libcxxabi, libuuid, llvm
, libobjc ? null, maloader ? null , libobjc ? null, maloader ? null
, enableDumpNormalizedLibArgs ? false , enableDumpNormalizedLibArgs ? false
, enableTapiSupport ? stdenv.hostPlatform != stdenv.targetPlatform, libtapi , enableTapiSupport ? true, libtapi
}: }:
let let

8
pkgs/stdenv/darwin/default.nix
View File

@ -200,7 +200,12 @@ in rec {
python2 = self.python; python2 = self.python;
ninja = super.ninja.override { buildDocs = false; }; 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 { in with prevStage; stageFun 1 prevStage {
extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@ -326,6 +331,7 @@ in rec {
darwin = super.darwin // rec { darwin = super.darwin // rec {
inherit (darwin) dyld Libsystem libiconv locale; inherit (darwin) dyld Libsystem libiconv locale;
cctools = super.darwin.cctools.override { enableTapiSupport = false; };
libxml2-nopython = super.libxml2.override { pythonSupport = false; }; libxml2-nopython = super.libxml2.override { pythonSupport = false; };
CF = super.darwin.CF.override { CF = super.darwin.CF.override {
libxml2 = libxml2-nopython; libxml2 = libxml2-nopython;