Skip to content

crossStdenv on iphone: Just get info from targetPlatform #25190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 1 commit into from
Apr 24, 2017
Merged

crossStdenv on iphone: Just get info from targetPlatform #25190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkgs/os-specific/darwin/ios-cross/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, stdenv
, coreutils
, gnugrep
, targetPlatform
}:

/* As of this writing, known-good prefix/arch/simulator triples:
Expand All @@ -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";
Expand Down
6 changes: 1 addition & 5 deletions pkgs/stdenv/cross/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down