Remerge pull request #29517 from master into staging

This commit is contained in:
John Ericson 2017-09-18 14:42:51 -04:00
commit cbdd77f791

View file

@ -294,7 +294,9 @@ in rec {
};
darwin = super.darwin // {
inherit (darwin) dyld ICU Libsystem cctools libiconv;
inherit (darwin) dyld ICU Libsystem libiconv;
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
inherit (darwin) cctools;
};
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling.