mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-11-05 12:47:43 +00:00
Include the NDK composition SDK tools in Android evaluation
This commit is contained in:
1 file changed
+6
-4
@@ -20,20 +20,22 @@
|
||||
aarch64-android-prebuilt = import prev.path {
|
||||
inherit system;
|
||||
inherit (prev) overlays;
|
||||
# The prebuilt Android NDK and its compiler wrappers are unfree.
|
||||
# Nixpkgs marks the prebuilt NDK, SDK tools, and wrappers unfree.
|
||||
config = prev.config // {
|
||||
allowUnfreePredicate = package:
|
||||
prev.lib.hasInfix "ndk" (prev.lib.getName package);
|
||||
let name = prev.lib.getName package; in
|
||||
prev.lib.hasInfix "ndk" name || prev.lib.hasPrefix "android-sdk-" name;
|
||||
};
|
||||
crossSystem = prev.lib.systems.examples.aarch64-android-prebuilt // { androidSdkVersion = "26"; };
|
||||
};
|
||||
armv7a-android-prebuilt = import prev.path {
|
||||
inherit system;
|
||||
inherit (prev) overlays;
|
||||
# The prebuilt Android NDK and its compiler wrappers are unfree.
|
||||
# Nixpkgs marks the prebuilt NDK, SDK tools, and wrappers unfree.
|
||||
config = prev.config // {
|
||||
allowUnfreePredicate = package:
|
||||
prev.lib.hasInfix "ndk" (prev.lib.getName package);
|
||||
let name = prev.lib.getName package; in
|
||||
prev.lib.hasInfix "ndk" name || prev.lib.hasPrefix "android-sdk-" name;
|
||||
};
|
||||
crossSystem = prev.lib.systems.examples.armv7a-android-prebuilt // { androidSdkVersion = "26"; };
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user