diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 14:42:51 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 14:42:51 -0400 |
| commit | cbdd77f7911c5d8f2b5410f3c509dee287647f63 (patch) | |
| tree | 8e772d1a075456bcfab02ffc19291ab328a2e66c | |
| parent | b89c3afb5f6ab8544b19112969f8b3f80a7bbedc (diff) | |
| parent | 77bd6313bb5b99bbb48038b24536ddf4272a37d4 (diff) | |
| download | nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar.gz nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar.bz2 nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar.lz nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar.xz nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.tar.zst nixlib-cbdd77f7911c5d8f2b5410f3c509dee287647f63.zip | |
Remerge pull request #29517 from master into staging
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f4801d674e8a..b7f750508e8c 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -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. |