androidndk: Avoid depending on target-sensative openjdk

We just need jdk for this script that helps set up toolchains. The
script might need to know about the target platform, but the interpreter
that runs it (or part of it) doesn't.
This commit is contained in:
John Ericson
2020-09-08 09:49:39 -04:00
parent e2bef8fbdc
commit 452854a13c
3 changed files with 10 additions and 6 deletions
@@ -1,4 +1,4 @@
{ config, pkgs ? import <nixpkgs> {}
{ config, pkgs ? import <nixpkgs> {}, pkgsHostHost ? pkgs.pkgsHostHost
, pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; }
, licenseAccepted ? config.android_sdk.accept_license or false
}:
@@ -6,7 +6,7 @@
rec {
composeAndroidPackages = import ./compose-android-packages.nix {
inherit (pkgs) requireFile autoPatchelfHook;
inherit pkgs pkgs_i686 licenseAccepted;
inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted;
};
buildApp = import ./build-app.nix {