Add allowUnfree parameter to allow Java builds to work
This commit is contained in:
parent
3c8311aae6
commit
e9a1b1e18c
@ -4,15 +4,16 @@
|
|||||||
, tiVersion ? "3.2.2.GA"
|
, tiVersion ? "3.2.2.GA"
|
||||||
, rename ? false
|
, rename ? false
|
||||||
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
|
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
|
||||||
|
, allowUnfree ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {};
|
pkgs = import nixpkgs { config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
|
kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
import ./kitchensink {
|
import ./kitchensink {
|
||||||
inherit (pkgs) fetchgit;
|
inherit (pkgs) fetchgit;
|
||||||
@ -23,7 +24,7 @@ rec {
|
|||||||
|
|
||||||
kitchensink_android_release = pkgs.lib.genAttrs systems (system:
|
kitchensink_android_release = pkgs.lib.genAttrs systems (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
import ./kitchensink {
|
import ./kitchensink {
|
||||||
inherit (pkgs) fetchgit;
|
inherit (pkgs) fetchgit;
|
||||||
@ -35,7 +36,7 @@ rec {
|
|||||||
|
|
||||||
emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
|
emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
import ./emulate-kitchensink {
|
import ./emulate-kitchensink {
|
||||||
inherit (pkgs) androidenv;
|
inherit (pkgs) androidenv;
|
||||||
@ -44,7 +45,7 @@ rec {
|
|||||||
|
|
||||||
emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
|
emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
import ./emulate-kitchensink {
|
import ./emulate-kitchensink {
|
||||||
inherit (pkgs) androidenv;
|
inherit (pkgs) androidenv;
|
||||||
@ -78,7 +79,7 @@ rec {
|
|||||||
};
|
};
|
||||||
} else {}) // (if rename then
|
} else {}) // (if rename then
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { system = "x86_64-darwin"; };
|
pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
kitchensink_ipa = import ./kitchensink {
|
kitchensink_ipa = import ./kitchensink {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user