diff options
| author | Sander van der Burg <svanderburg@mgail.com> | 2014-10-15 17:28:52 +0200 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@mgail.com> | 2014-10-15 17:28:52 +0200 |
| commit | 0100e79d7a03694496a9c712235dce14e695c47e (patch) | |
| tree | cf98f38ebe90a2b017242d02a44f5c89a95b8e06 | |
| parent | f58b563cb65dc0611815f3a5570dd704e61810c3 (diff) | |
| download | nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar.gz nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar.bz2 nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar.lz nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar.xz nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.tar.zst nixpkgs-0100e79d7a03694496a9c712235dce14e695c47e.zip | |
titaniumenv: Use new xcodeenv simulate function in the example app
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/examples/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/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"; } |