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:
@@ -1,4 +1,4 @@
|
||||
{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}:
|
||||
{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}:
|
||||
|
||||
{ toolsVersion ? "25.2.5"
|
||||
, platformToolsVersion ? "29.0.6"
|
||||
@@ -144,7 +144,7 @@ rec {
|
||||
) cmakeVersions;
|
||||
|
||||
ndk-bundle = import ./ndk-bundle {
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools;
|
||||
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools;
|
||||
package = packages.ndk-bundle.${ndkVersion};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user