darwin cross: include CoreFoundation in stdenv
This commit is contained in:
parent
9e05276949
commit
a7bcb6b936
|
@ -48,7 +48,9 @@ in lib.init bootStages ++ [
|
||||||
# Prior overrides are surely not valid as packages built with this run on
|
# Prior overrides are surely not valid as packages built with this run on
|
||||||
# a different platform, and so are disabled.
|
# a different platform, and so are disabled.
|
||||||
overrides = _: _: {};
|
overrides = _: _: {};
|
||||||
extraBuildInputs = [ ]; # Old ones run on wrong platform
|
extraBuildInputs = [ ] # Old ones run on wrong platform
|
||||||
|
++ lib.optionals hostPlatform.isDarwin [ buildPackages.targetPackages.darwin.apple_sdk.frameworks.CoreFoundation ]
|
||||||
|
;
|
||||||
allowedRequisites = null;
|
allowedRequisites = null;
|
||||||
|
|
||||||
hasCC = !targetPlatform.isGhcjs;
|
hasCC = !targetPlatform.isGhcjs;
|
||||||
|
|
|
@ -30,7 +30,18 @@ in
|
||||||
# just the plain stdenv.
|
# just the plain stdenv.
|
||||||
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
|
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
|
||||||
|
|
||||||
stdenvNoCC = stdenv.override { cc = null; hasCC = false; };
|
stdenvNoCC = stdenv.override (
|
||||||
|
{ cc = null; hasCC = false; }
|
||||||
|
|
||||||
|
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin && (stdenv.hostPlatform != stdenv.buildPlatform)) {
|
||||||
|
# TODO: This is a hack to use stdenvNoCC to produce a CF when cross
|
||||||
|
# compiling. It's not very sound. The cross stdenv has:
|
||||||
|
# extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ]
|
||||||
|
# and uses stdenvNoCC. In order to make this not infinitely recursive, we need to exclude
|
||||||
|
# this extraBuildInput.
|
||||||
|
extraBuildInputs = [];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
mkStdenvNoLibs = stdenv: let
|
mkStdenvNoLibs = stdenv: let
|
||||||
bintools = stdenv.cc.bintools.override {
|
bintools = stdenv.cc.bintools.override {
|
||||||
|
|
Loading…
Reference in a new issue