diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
| commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
| tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /lib/systems | |
| parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
| parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
| download | nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixlib-003473613a084b38a1f0335ba8035461b4190e5d.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/examples.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9c43d9b1bbc7..4c7dd9917919 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -45,7 +45,7 @@ rec { aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; - sdkVer = "21"; + sdkVer = "24"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; |