androidndk: Fix usage as crossSystem

2018-05-17 17:22:27 +02:00
parent c056694d74
commit 832a8ca087
5 changed files with 35 additions and 8 deletions
@@ -281,4 +281,19 @@ rec {
    inherit androidndk;
    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
  };
+
+  androidndkPkgs_10e = import ./androidndk-pkgs.nix {
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      lib hostPlatform targetPlatform
+      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 = androidndk_10e;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
+  };
 }