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

Remerge pull request #29517 from master into staging

Browse Source
This commit is contained in:
John Ericson 2017-09-18 14:42:51 -04:00
commit cbdd77f791
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,9 @@ in rec {
}; };
darwin = super.darwin // { 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) { } // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling. # Need to get rid of these when cross-compiling.