diff options
| author | Dan Peebles <pumpkin@me.com> | 2015-02-18 00:22:38 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2015-02-18 00:24:33 -0500 |
| commit | ecf662efc61cfb125e8cbdc983abf9e9cad829e2 (patch) | |
| tree | 767915953d6e0a435e8fe4b176bbbbee83504fb1 /pkgs/top-level | |
| parent | 9f84592160c4eec51c73808c7b916894570980a5 (diff) | |
| download | nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar.gz nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar.bz2 nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar.lz nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar.xz nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.tar.zst nixlib-ecf662efc61cfb125e8cbdc983abf9e9cad829e2.zip | |
Flip cctools and cctools cross
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
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; |