diff options
author | Sander van der Burg <sander@conference-compass.com> | 2014-01-13 14:34:46 +0100 |
---|---|---|
committer | Sander van der Burg <sander@conference-compass.com> | 2014-01-13 14:34:46 +0100 |
commit | 0583cb37e6a9d4f5791c7acbff7351caeaf5235c (patch) | |
tree | e5d69f1893dbcd044a4e56e0264b5233af00c4ba /pkgs/development/mobile | |
parent | 25bd160ca830040dfef0111c9dd9c624ad150560 (diff) | |
download | nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar.gz nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar.bz2 nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar.lz nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar.xz nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.tar.zst nixpkgs-0583cb37e6a9d4f5791c7acbff7351caeaf5235c.zip |
Make xcode version configurable + fix android emulator tests
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r-- | pkgs/development/mobile/titaniumenv/examples/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 73cca85c9f5..03abd599748 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,5 +1,6 @@ { nixpkgs ? <nixpkgs> , systems ? [ "x86_64-linux" "x86_64-darwin" ] +, xcodeVersion ? "5.0" }: let @@ -21,7 +22,7 @@ rec { in import ./emulate-kitchensink { inherit (pkgs.titaniumenv) androidenv; - kitchensink = kitchensink_android; + kitchensink = builtins.getAttr system kitchensink_android; }); } // (if builtins.elem "x86_64-darwin" systems then @@ -30,20 +31,21 @@ rec { in rec { kitchensink_iphone = import ./kitchensink { - inherit (pkgs) fetchgit titaniumenv; + inherit (pkgs) fetchgit; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; }; target = "iphone"; }; simulate_kitchensink_iphone = import ./simulate-kitchensink { inherit (pkgs) stdenv; - inherit (pkgs.titaniumenv) xcodeenv; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; kitchensink = kitchensink_iphone; device = "iPhone"; }; simulate_kitchensink_ipad = import ./simulate-kitchensink { inherit (pkgs) stdenv; - inherit (pkgs.titaniumenv) xcodeenv; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; kitchensink = kitchensink_iphone; device = "iPad"; }; |