From 0583cb37e6a9d4f5791c7acbff7351caeaf5235c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Mon, 13 Jan 2014 14:34:46 +0100
Subject: [PATCH] Make xcode version configurable + fix android emulator tests

---
 .../mobile/titaniumenv/examples/default.nix            | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 73cca85c9f58..03abd599748f 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";
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f86210fecc91..f2d9374e037e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -483,7 +483,7 @@ let
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
-  titaniumenv = import ../development/mobile/titaniumenv {
+  titaniumenv = callPackage ../development/mobile/titaniumenv {
     inherit pkgs;
     pkgs_i686 = pkgsi686Linux;
   };