diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-12 10:00:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-09-12 10:00:45 +0200 |
| commit | 37d29394ecba3ccff2083119ec49fc3eaf36db8c (patch) | |
| tree | f5392870bb7a3c48a55cd326dc4f51d9000cb59e /lib/systems | |
| parent | 6d269ce4095d110e9e1bc0e358338f8dc8f58076 (diff) | |
| parent | fd6899d9b5171da75d53b2435cefee8de4212521 (diff) | |
| download | nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar.gz nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar.bz2 nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar.lz nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar.xz nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.tar.zst nixpkgs-37d29394ecba3ccff2083119ec49fc3eaf36db8c.zip | |
Merge staging-next into staging
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/architectures.nix | 2 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 9d1c29fd9f0..bfecaec1ae8 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -60,7 +60,7 @@ rec { }; predicates = let - featureSupport = feature: x: builtins.elem feature features.${x}; + featureSupport = feature: x: builtins.elem feature features.${x} or []; in { sse3Support = featureSupport "sse3"; ssse3Support = featureSupport "ssse3"; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 5b90fdca524..87c05a0b052 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -47,7 +47,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; sdkVer = "29"; - ndkVer = "18b"; + ndkVer = "21"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; @@ -55,7 +55,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; sdkVer = "29"; - ndkVer = "18b"; + ndkVer = "21"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; |