diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-17 00:36:10 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-27 14:15:39 -0500 |
| commit | 2482e2858e7e2d5e91f506932f3774288ca6120d (patch) | |
| tree | 3619ff9d81826a55baa3d4b10ab8a4f1c96d3abe /pkgs/stdenv/cross/default.nix | |
| parent | dfc5d7835d6e248d3cc83430da941277ae5cabaa (diff) | |
| download | nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.gz nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.bz2 nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.lz nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.xz nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.zst nixpkgs-2482e2858e7e2d5e91f506932f3774288ca6120d.zip | |
prebuilt android tools: Init using SDK
Expose as an option for the cross stdenv.
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 8197510eeec..8da3555c6c6 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -34,7 +34,9 @@ in bootStages ++ [ hostPlatform = crossSystem; targetPlatform = crossSystem; cc = if crossSystem.useiOSCross or false - then buildPackages.darwin.ios-cross + then buildPackages.darwin.ios-cross + else if crossSystem.useAndroidPrebuilt + then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; }) |