From ce7f235a09402791ffcbae5ce5fd9e93e8296b7e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 15 Oct 2013 16:32:16 +0200 Subject: [PATCH] Make arbitrary arguments to the generic builder possible --- pkgs/development/mobile/androidenv/build-app.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 2792d364f15..3349cd5b9be 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -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"])