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/development/mobile/androidenv/default.nix | |
parent | dfc5d7835d6e248d3cc83430da941277ae5cabaa (diff) | |
download | nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.gz nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.bz2 nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.lz nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.xz nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.tar.zst nixlib-2482e2858e7e2d5e91f506932f3774288ca6120d.zip |
prebuilt android tools: Init using SDK
Expose as an option for the cross stdenv.
Diffstat (limited to 'pkgs/development/mobile/androidenv/default.nix')
-rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 98531eeb069e..c053712302dd 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -242,4 +242,19 @@ rec { inherit (pkgs) stdenv; inherit androidsdk; }; + + androidndkPkgs = import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + lib hostPlatform targetPlatform + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk; + inherit androidndk; + targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs; + }; } |