mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

androidenv: use unzip in nativeBuildInputs

Browse Source
This commit is contained in:
Hadi 2023-01-03 18:15:27 -05:00
parent 2f06edee4f
commit 8ca4470a5e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/mobile/androidenv/deploy-androidpackages.nix
View File

@ -1,17 +1,18 @@
{stdenv, lib, unzip, mkLicenses}: {stdenv, lib, unzip, mkLicenses}:
{packages, os ? null, buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: {packages, os ? null, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args:
let 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; sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages;
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
inherit buildInputs;
pname = lib.concatMapStringsSep "-" (package: package.name) sortedPackages; pname = lib.concatMapStringsSep "-" (package: package.name) sortedPackages;
version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages; version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages;
src = map (package: src = map (package:
if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all
) packages; ) packages;
buildInputs = [ unzip ] ++ buildInputs; nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
preferLocalBuild = true; preferLocalBuild = true;
unpackPhase = '' unpackPhase = ''