Make "nix-env -i android-sdk" DTRT
This commit is contained in:
parent
8fccca30f1
commit
e89eab8893
|
@ -8,7 +8,7 @@
|
||||||
{platformVersions, useGoogleAPIs}:
|
{platformVersions, useGoogleAPIs}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "android-sdk-linux-20.0.3";
|
name = "android-sdk-20.0.3";
|
||||||
|
|
||||||
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
|
||||||
then fetchurl {
|
then fetchurl {
|
||||||
|
|
|
@ -407,6 +407,8 @@ let
|
||||||
pkgs_i686 = pkgsi686Linux;
|
pkgs_i686 = pkgsi686Linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
inherit (androidenv) androidsdk_4_1;
|
||||||
|
|
||||||
aria = builderDefsPackage (import ../tools/networking/aria) { };
|
aria = builderDefsPackage (import ../tools/networking/aria) { };
|
||||||
|
|
||||||
aria2 = callPackage ../tools/networking/aria2 { };
|
aria2 = callPackage ../tools/networking/aria2 { };
|
||||||
|
|
Loading…
Reference in a new issue