diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-24 16:57:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 16:57:54 -0400 |
| commit | af6e4c5b0d92301f24cdb96aae2267ceec26f6ff (patch) | |
| tree | 6fd79da9e7d2893ef760f909c6953f46b51ba886 /pkgs | |
| parent | 84b1c0c481d4c97957252182a6273cea9062f4f7 (diff) | |
| parent | db5a921945b9b2051077a6b7b708e3b1785cc3ea (diff) | |
| download | nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar.gz nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar.bz2 nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar.lz nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar.xz nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.tar.zst nixlib-af6e4c5b0d92301f24cdb96aae2267ceec26f6ff.zip | |
Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor
crossStdenv on iphone: Just get info from `targetPlatform`
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/ios-cross/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index 7de7d291289f..e5375ef60915 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 e322d4655201..05910d100a87 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 |