From 8ca4470a5e72131b3687856cd60848dd46dda4a7 Mon Sep 17 00:00:00 2001 From: Hadi Date: Tue, 3 Jan 2023 18:15:27 -0500 Subject: [PATCH] androidenv: use unzip in nativeBuildInputs --- .../mobile/androidenv/deploy-androidpackages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index 521101513ff2..d495f2afd466 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -1,17 +1,18 @@ {stdenv, lib, unzip, mkLicenses}: -{packages, os ? null, buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: +{packages, os ? null, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: let - extraParams = removeAttrs args [ "packages" "os" "buildInputs" "patchesInstructions" ]; + extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ]; sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages; in stdenv.mkDerivation ({ + inherit buildInputs; pname = lib.concatMapStringsSep "-" (package: package.name) sortedPackages; version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages; src = map (package: if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all ) packages; - buildInputs = [ unzip ] ++ buildInputs; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; preferLocalBuild = true; unpackPhase = ''