public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

androidenv/emulate-app: fix passing extra args to the sdk composition

Browse Source 
This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
This commit is contained in:
Erik Arvstedt 2019-08-17 10:48:06 +02:00
parent e48d97f640
commit 0dab612395
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/mobile/androidenv/emulate-app.nix
View File

@ -1,24 +1,21 @@
{ composeAndroidPackages, stdenv }: { composeAndroidPackages, stdenv }:
{ name, app ? null { name, app ? null
, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false , platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default"
, enableGPU ? false, extraAVDFiles ? [] , enableGPU ? false, extraAVDFiles ? []
, package ? null, activity ? null , package ? null, activity ? null
, avdHomeDir ? null , avdHomeDir ? null, sdkExtraArgs ? {}
}@args: }:
let let
androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); sdkArgs = {
# Extract the parameters meant for the Android SDK
androidParams = {
platformVersions = [ platformVersion ]; platformVersions = [ platformVersion ];
includeEmulator = true; includeEmulator = true;
includeSystemImages = true; includeSystemImages = true;
systemImageTypes = [ systemImageType ]; systemImageTypes = [ systemImageType ];
abiVersions = [ abiVersion ]; abiVersions = [ abiVersion ];
}; } // sdkExtraArgs;
androidsdkComposition = (composeAndroidPackages androidParams).androidsdk; androidsdkComposition = (composeAndroidPackages sdkArgs).androidsdk;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; inherit name;