androidenv: Better platform conditionals

4 files changed, 23 insertions, 10 deletions

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 8ef58471d6a04..81ec5732b9a2a 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  buildInputs = [ p7zip makeWrapper ];
+  nativeBuildInputs = [ p7zip makeWrapper ];
 
   buildCommand = let
     bin_path = "$out/bin";
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index ccf22d6b95364..271a18e4ee06e 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   buildCommand = let
     bin_path = "$out/bin";
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 2e8b5d286aca7..98531eeb069ee 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,8 +1,10 @@
-{pkgs, pkgs_i686, includeSources ? true}:
+{ buildPackages, pkgs, pkgs_i686, targetPackages
+, includeSources ? true
+}:
 
 rec {
   platformTools = import ./platform-tools.nix {
-    inherit (pkgs) stdenv fetchurl unzip zlib;
+    inherit buildPackages pkgs;
   };
 
   buildTools = import ./build-tools.nix {
@@ -214,14 +216,20 @@ rec {
   };
 
   androidndk = import ./androidndk.nix {
-    inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
-    inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit (buildPackages)
+      p7zip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib
+      coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
   };
 
   androidndk_r8e = import ./androidndk_r8e.nix {
-    inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper;
-    inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib
+      coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
   };
 
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index fe75655c02bdd..f5e5799428469 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,4 +1,9 @@
-{stdenv, zlib, fetchurl, unzip}:
+{ buildPackages, pkgs }:
+
+let
+  inherit (buildPackages) fetchurl unzip;
+  inherit (pkgs) stdenv zlib;
+in
 
 stdenv.mkDerivation rec {
   version = "26.0.2";
@@ -42,5 +47,5 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
 }