diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 7de7d291289..e5375ef6091 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -6,6 +6,7 @@ , stdenv , coreutils , gnugrep +, targetPlatform }: /* As of this writing, known-good prefix/arch/simulator triples: @@ -15,7 +16,12 @@ * x86_64-apple-darwin14 | x86_64 | true */ -{ prefix, arch, simulator ? false }: let +let + + prefix = targetPlatform.config; + inherit (targetPlatform) arch; + simulator = targetPlatform.isiPhoneSimulator or false; + sdkType = if simulator then "Simulator" else "OS"; sdkVer = "10.2"; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index e322d465520..05910d100a8 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -35,11 +35,7 @@ in bootStages ++ [ selfBuild = false; stdenv = if crossSystem.useiOSCross or false then let - inherit (buildPackages.darwin.ios-cross { - prefix = crossSystem.config; - inherit (crossSystem) arch; - simulator = crossSystem.isiPhoneSimulator or false; }) - cc binutils; + inherit (buildPackages.darwin.ios-cross) cc binutils; in buildPackages.makeStdenvCross buildPackages.stdenv crossSystem binutils cc