From ecf662efc61cfb125e8cbdc983abf9e9cad829e2 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 18 Feb 2015 00:22:38 -0500 Subject: Flip cctools and cctools cross --- pkgs/top-level/all-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89b99761bfe..e3c3e66156f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4656,7 +4656,7 @@ let }); binutilsCross = - if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools + if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools_cross else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils { inherit stdenv fetchurl zlib bison; noSysDirs = true; @@ -8448,14 +8448,13 @@ let cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; }; in apple-source-releases // rec { - - cctools = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { + cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) { cross = assert crossSystem != null; crossSystem; inherit maloader; xctoolchain = xcode.toolchain; }; - cctools_native = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix {}).native; maloader = callPackage ../os-specific/darwin/maloader { inherit opencflite; -- cgit 1.4.1