diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-20 18:31:16 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-24 01:43:10 -0500 |
| commit | 7748972763c7db9589a3b7dc1bca4f9b688009e6 (patch) | |
| tree | e6e3d7a89c8d3bf6000445f35a79949bc473b9cc /pkgs/development/mobile/androidenv/default.nix | |
| parent | fe5ae8b5507fb195346522c9a8f689b73a0d39ce (diff) | |
| download | nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar.gz nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar.bz2 nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar.lz nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar.xz nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.tar.zst nixlib-7748972763c7db9589a3b7dc1bca4f9b688009e6.zip | |
androidenv: Better platform conditionals
Diffstat (limited to 'pkgs/development/mobile/androidenv/default.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 2e8b5d286aca..98531eeb069e 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,8 +1,10 @@ -{pkgs, pkgs_i686, includeSources ? true}: +{ buildPackages, pkgs, pkgs_i686, targetPackages +, includeSources ? true +}: rec { platformTools = import ./platform-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib; + inherit buildPackages pkgs; }; buildTools = import ./build-tools.nix { @@ -214,14 +216,20 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + p7zip makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; androidndk_r8e = import ./androidndk_r8e.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper; - inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv fetchurl zlib ncurses lib + coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; |