From 77bd6313bb5b99bbb48038b24536ddf4272a37d4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 15 Jun 2017 14:37:35 -0400 Subject: [PATCH] darwin stdenv: cctools override needs to go away when targetPlatform changes --- pkgs/stdenv/darwin/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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.