diff options
author | Ken Micklas <ken.micklas@obsidian.systems> | 2018-04-15 19:21:45 -0400 |
---|---|---|
committer | Ken Micklas <ken.micklas@obsidian.systems> | 2018-04-19 16:09:30 -0400 |
commit | ef3db7d14c90e1876d38ebc25428b4f65962ffbc (patch) | |
tree | 174e07b10781aed9b05fdf968fa57115a5509a9c /pkgs/top-level/darwin-packages.nix | |
parent | b1a8894a1cd386319f771998de417ce0a4a75b7c (diff) |
ios-sdk-pkgs: Init from iOS SDK from XCode
Diffstat (limited to 'pkgs/top-level/darwin-packages.nix')
-rw-r--r-- | pkgs/top-level/darwin-packages.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index d1d5aa470bca..d2d41792c461 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -1,4 +1,6 @@ -{ pkgs, darwin, stdenv, callPackage, callPackages, newScope }: +{ buildPackages, pkgs, targetPackages +, darwin, stdenv, callPackage, callPackages, newScope +}: let apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; @@ -10,19 +12,23 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; + binutils-unwrapped = callPackage ../os-specific/darwin/binutils { + inherit (darwin) cctools; + inherit (pkgs) binutils-unwrapped; + }; + binutils = pkgs.wrapBintoolsWith { libc = if pkgs.targetPlatform != pkgs.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; - bintools = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; - }; + bintools = darwin.binutils-unwrapped; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + libcxxabi = pkgs.libcxxabi; xctoolchain = darwin.xcode.toolchain; }; @@ -39,8 +45,10 @@ in insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - ios-cross = callPackage ../os-specific/darwin/ios-cross { - inherit (darwin) binutils; + iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { + buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; + targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; + inherit (pkgs.llvmPackages) clang-unwrapped; }; libobjc = apple-source-releases.objc4; |