Merge remote-tracking branch 'origin/master' into stdenv-updates

3 files changed, 16 insertions, 14 deletions

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index aa46517f5718..c05bf88ffbff 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
             
             cp -av * $out
             cd $out
-            ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}"
+            ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal
           ''
 
       else throw "Target: ${target} is not supported!"}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
index d3831a9c2bea..b4cd1a98fb06 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}:
 
 stdenv.mkDerivation {
   name = "titanium-mobilesdk-2.1.5.v20121112144658";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
-    sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
-    sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
+  src = if src == null then
+    if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
+      sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
+    }
+    else if stdenv.system == "x86_64-darwin" then fetchurl {
+      url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
+      sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
+    }
+    else throw "Platform: ${stdenv.system} not supported!"
+  else src;
   
   buildInputs = [ unzip makeWrapper ];
   
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 456732abe1f4..e3eff458d272 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -2,14 +2,14 @@
 {name, app, device ? "iPhone", baseDir ? ""}:
 
 stdenv.mkDerivation {
-  inherit name;
+  name = stdenv.lib.replaceChars [" "] [""] name;
   buildCommand = ''
     ensureDir $out/bin
     cat > $out/bin/run-test-simulator << "EOF"
     #! ${stdenv.shell} -e
 
-    cd ${app}/${baseDir}/${name}.app
-    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}'
+    cd '${app}/${baseDir}/${name}.app'
+    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}'
     EOF
     chmod +x $out/bin/run-test-simulator
   '';