JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor

Browse Source 
crossStdenv on iphone: Just get info from `targetPlatform`
This commit is contained in:
John Ericson 2017-04-24 16:57:54 -04:00 committed by GitHub
commit af6e4c5b0d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/darwin/ios-cross/default.nix
View File

@ -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";

6
pkgs/stdenv/cross/default.nix
View File

@ -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