stdenv/darwin: enable tapi support in cctools

This commit is contained in:
Andrew Childs 2020-07-25 15:26:54 +09:00
parent b418d4c6a4
commit 630f5d30df
3 changed files with 9 additions and 10 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
{ lib, stdenv, fetchFromGitHub, cmake, python3, ncurses }:
stdenv.mkDerivation {
name = "libtapi-1000.10.8";
@ -13,6 +13,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python3 ];
# ncurses is required here to avoid a reference to bootstrap-tools, which is
# not allowed for the stdenv.
buildInputs = [ ncurses ];
cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ];
# fixes: fatal error: 'clang/Basic/Diagnostic.h' file not found

View file

@ -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: {

View file

@ -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