mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
androidenv: use unzip in nativeBuildInputs
This commit is contained in:
parent
2f06edee4f
commit
8ca4470a5e
@ -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 = ''
|
||||
|
Loading…
Reference in New Issue
Block a user