diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-09-10 23:23:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:23:52 -0500 |
| commit | 61517de024cc9e61c18f2434656c18067a2d68a4 (patch) | |
| tree | c59385d6d8512a395d973174abe87cc9db21017f /pkgs/stdenv | |
| parent | e6f5583c6e0d8ea529ace71a1e1d146819a7aa9d (diff) | |
| parent | 630f5d30df4256991b2e72658eedeb954f7559f6 (diff) | |
Merge pull request #93912 from thefloweringash/cctools-tapi
stdenv/darwin: enable tapi support in cctools
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9de6ef63bfea..3f06dec10af8 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -198,12 +198,6 @@ in rec { python3 = super.python3Minimal; ninja = super.ninja.override { buildDocs = false; }; - - darwin = super.darwin // { - cctools = super.darwin.cctools.override { - enableTapiSupport = false; - }; - }; }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; @@ -305,7 +299,7 @@ in rec { persistent = self: super: with prevStage; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash python3 - ncurses libffi zlib gmp pcre gnugrep + ncurses libffi zlib gmp pcre gnugrep cmake coreutils findutils diffutils patchutils ninja libxml2; # Hack to make sure we don't link ncurses in bootstrap tools. The proper @@ -330,7 +324,6 @@ in rec { darwin = super.darwin // rec { inherit (darwin) dyld Libsystem libiconv locale; - cctools = super.darwin.cctools.override { enableTapiSupport = false; }; CF = super.darwin.CF.override { inherit libxml2; python3 = prevStage.python3; @@ -419,7 +412,7 @@ in rec { curl.out openssl.out libssh2.out nghttp2.lib libkrb5 cc.expand-response-params libxml2.out ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale + dyld Libsystem CF cctools ICU libiconv locale libtapi ]); overrides = lib.composeExtensions persistent (self: super: { diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index a299879693c8..31e129639376 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -100,6 +100,8 @@ in rec { cp ${cctools_}/bin/$i $out/bin done + cp -d ${darwin.libtapi}/lib/libtapi* $out/lib + cp -rd ${pkgs.darwin.CF}/Library $out chmod -R u+w $out |