forked from mirrors/nixpkgs
androidenv: Better platform conditionals
This commit is contained in:
parent
fe5ae8b550
commit
7748972763
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
phases = "buildPhase";
|
phases = "buildPhase";
|
||||||
|
|
||||||
buildInputs = [ p7zip makeWrapper ];
|
nativeBuildInputs = [ p7zip makeWrapper ];
|
||||||
|
|
||||||
buildCommand = let
|
buildCommand = let
|
||||||
bin_path = "$out/bin";
|
bin_path = "$out/bin";
|
||||||
|
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
phases = "buildPhase";
|
phases = "buildPhase";
|
||||||
|
|
||||||
buildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
buildCommand = let
|
buildCommand = let
|
||||||
bin_path = "$out/bin";
|
bin_path = "$out/bin";
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
{pkgs, pkgs_i686, includeSources ? true}:
|
{ buildPackages, pkgs, pkgs_i686, targetPackages
|
||||||
|
, includeSources ? true
|
||||||
|
}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
platformTools = import ./platform-tools.nix {
|
platformTools = import ./platform-tools.nix {
|
||||||
inherit (pkgs) stdenv fetchurl unzip zlib;
|
inherit buildPackages pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildTools = import ./build-tools.nix {
|
buildTools = import ./build-tools.nix {
|
||||||
|
@ -214,14 +216,20 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
androidndk = import ./androidndk.nix {
|
androidndk = import ./androidndk.nix {
|
||||||
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
|
inherit (buildPackages)
|
||||||
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
|
p7zip makeWrapper;
|
||||||
|
inherit (pkgs)
|
||||||
|
stdenv fetchurl zlib ncurses lib
|
||||||
|
coreutils file findutils gawk gnugrep gnused jdk which;
|
||||||
inherit platformTools;
|
inherit platformTools;
|
||||||
};
|
};
|
||||||
|
|
||||||
androidndk_r8e = import ./androidndk_r8e.nix {
|
androidndk_r8e = import ./androidndk_r8e.nix {
|
||||||
inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper;
|
inherit (buildPackages)
|
||||||
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
|
makeWrapper;
|
||||||
|
inherit (pkgs)
|
||||||
|
stdenv fetchurl zlib ncurses lib
|
||||||
|
coreutils file findutils gawk gnugrep gnused jdk which;
|
||||||
inherit platformTools;
|
inherit platformTools;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{stdenv, zlib, fetchurl, unzip}:
|
{ buildPackages, pkgs }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (buildPackages) fetchurl unzip;
|
||||||
|
inherit (pkgs) stdenv zlib;
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "26.0.2";
|
version = "26.0.2";
|
||||||
|
@ -42,5 +47,5 @@ stdenv.mkDerivation rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue