summary refs log tree commit diff
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2014-04-18 20:05:39 +0200
committerSander van der Burg <svanderburg@gmail.com>2014-04-18 20:05:39 +0200
commite9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1 (patch)
tree267c6248c2a28a0403642a528047204a32eb481c
parent3c8311aae6501e27f14dcd703dd863a9f7acc050 (diff)
downloadnixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar.gz
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar.bz2
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar.lz
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar.xz
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.tar.zst
nixlib-e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1.zip
Add allowUnfree parameter to allow Java builds to work
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index b81fcd41bcb9..556b96975b4e 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -4,15 +4,16 @@
 , tiVersion ? "3.2.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
+, allowUnfree ? false
 }:
 
 let
-  pkgs = import nixpkgs {};
+  pkgs = import nixpkgs { config.allowUnfree = allowUnfree; };
 in
 rec {
   kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -23,7 +24,7 @@ rec {
   
   kitchensink_android_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -35,7 +36,7 @@ rec {
   
   emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -44,7 +45,7 @@ rec {
   
   emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -78,7 +79,7 @@ rec {
   };
 } else {}) // (if rename then
   let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
+    pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; };
   in
   {
     kitchensink_ipa = import ./kitchensink {