diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 10:21:43 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 11:06:17 -0400 |
| commit | c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea (patch) | |
| tree | 6bbf251dabef7bd95397f7dc34a7843c3c3b1852 /lib/systems | |
| parent | cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a (diff) | |
| download | nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.gz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.bz2 nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.lz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.xz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.zst nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.zip | |
android: add ndkVer to resolve ndk ambiguity
It wasn’t exactly clear which NDK you were using previously. This adds an attribute to system that handles what version of the NDK we should use when building things. /cc @Ericson2314
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/examples.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 2d77a57fbe3..108996206a7 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -31,7 +31,8 @@ rec { armv5te-android-prebuilt = rec { config = "armv5tel-unknown-linux-androideabi"; - sdkVer = "24"; + sdkVer = "21"; + ndkVer = "10e"; platform = platforms.armv5te-android; useAndroidPrebuilt = true; }; @@ -39,6 +40,7 @@ rec { armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; + ndkVer = "17"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; @@ -46,6 +48,7 @@ rec { aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; sdkVer = "24"; + ndkVer = "17"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; |