1 files changed, 26 insertions, 28 deletions
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix
index 1c34b1dff7d8..341cdf72028d 100644
--- a/pkgs/development/androidndk-pkgs/default.nix
+++ b/pkgs/development/androidndk-pkgs/default.nix
@@ -3,34 +3,32 @@
 }:
 
 rec {
+  "18b" =
+    let
+      ndkVersion = "18.1.5063045";
 
-  "17c" = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17c;
-    androidndk = androidenv.androidndk_17c;
-    targetAndroidndkPkgs = targetPackages.androidndkPkgs_17c;
-  };
+      buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
+        includeNDK = true;
+        inherit ndkVersion;
+      };
 
-  "10e" = import ./androidndk-pkgs.nix {
-    inherit (buildPackages)
-      makeWrapper;
-    inherit (pkgs)
-      lib stdenv
-      runCommand wrapBintoolsWith wrapCCWith;
-    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
-    # but for splicing messing up on infinite recursion for the variants we
-    # *dont't* use. Using this workaround, but also making a test to ensure
-    # these two really are the same.
-    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
-    androidndk = androidenv.androidndk_10e;
-    targetAndroidndkPkgs = targetPackages.androidndkPkgs_10e;
-  };
+      androidComposition = androidenv.composeAndroidPackages {
+        includeNDK = true;
+        inherit ndkVersion;
+      };
+    in
+    import ./androidndk-pkgs.nix {
+      inherit (buildPackages)
+        makeWrapper;
+      inherit (pkgs)
+        lib stdenv
+        runCommand wrapBintoolsWith wrapCCWith;
+      # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+      # but for splicing messing up on infinite recursion for the variants we
+      # *dont't* use. Using this workaround, but also making a test to ensure
+      # these two really are the same.
+      buildAndroidndk = buildAndroidComposition.ndk-bundle;
+      androidndk = androidComposition.ndk-bundle;
+      targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b;
+    };
 }