lol

Make arbitrary arguments to the generic builder possible

+4 -4
+4 -4
pkgs/development/mobile/androidenv/build-app.nix
··· 1 1 { stdenv, androidsdk, jdk, ant }: 2 - { name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" 2 + args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" 3 3 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null 4 4 }: 5 5 ··· 15 15 abiVersions = []; 16 16 }; 17 17 in 18 - stdenv.mkDerivation { 18 + stdenv.mkDerivation ({ 19 19 name = stdenv.lib.replaceChars [" "] [""] name; 20 - inherit src; 21 20 22 21 ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}"; 23 22 ··· 45 44 mkdir -p $out/nix-support 46 45 echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products 47 46 ''; 48 - } 47 + } // 48 + builtins.removeAttrs args ["name"])