From 0100e79d7a03694496a9c712235dce14e695c47e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@mgail.com>
Date: Wed, 15 Oct 2014 17:28:52 +0200
Subject: [PATCH] titaniumenv: Use new xcodeenv simulate function in the
 example app

---
 .../mobile/titaniumenv/examples/default.nix           | 11 ++---------
 .../examples/simulate-kitchensink/default.nix         | 10 ++++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 13198922c75..a2cc690267c 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -66,18 +66,11 @@ rec {
     target = "iphone";
   };
 
-  simulate_kitchensink_iphone = import ./simulate-kitchensink {
+  simulate_kitchensink = import ./simulate-kitchensink {
     inherit (pkgs) stdenv;
     xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
     kitchensink = kitchensink_ios_development;
-    device = "iPhone";
-  };
-  
-  simulate_kitchensink_ipad = import ./simulate-kitchensink {
-    inherit (pkgs) stdenv;
-    xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; };
-    kitchensink = kitchensink_ios_development;
-    device = "iPad";
+    bundleId = if rename then newBundleId else "com.appcelerator.kitchensink";
   };
 } else {}) // (if rename then
   let
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
index a5ab8d59a74..15a86e338de 100644
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -1,9 +1,7 @@
-{stdenv, xcodeenv, kitchensink, device}:
+{stdenv, xcodeenv, kitchensink, bundleId}:
 
 xcodeenv.simulateApp {
-  name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}";
-  appName = "KitchenSink";
-  app = kitchensink;
-  inherit device;
-  baseDir = "build/iphone/build/Debug-iphonesimulator";
+  name = "simulate-${kitchensink.name}";
+  inherit bundleId;
+  app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator";
 }