Make arbitrary arguments to the generic builder possible

This commit is contained in:
Sander van der Burg 2013-10-15 16:32:16 +02:00
parent ae74b0ae58
commit ce7f235a09

View File

@ -1,5 +1,5 @@
{ stdenv, androidsdk, jdk, ant }:
{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
}:
@ -15,9 +15,8 @@ let
abiVersions = [];
};
in
stdenv.mkDerivation {
stdenv.mkDerivation ({
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
@ -45,4 +44,5 @@ stdenv.mkDerivation {
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
'';
}
} //
builtins.removeAttrs args ["name"])