about summary refs log tree commit diff
path: root/pkgs/development/mobile
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2013-05-29 13:50:53 +0200
committerSander van der Burg <svanderburg@gmail.com>2013-05-29 13:50:53 +0200
commitdde4a92c5c8fe9a322aafce04860f277d288377d (patch)
tree0a0d2249ec2d4c1d4565d0cc423dc778e6405d4b /pkgs/development/mobile
parent317fcd3b86b7c608c68da80bad57b634f68bdba6 (diff)
downloadnixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar.gz
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar.bz2
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar.lz
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar.xz
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.tar.zst
nixlib-dde4a92c5c8fe9a322aafce04860f277d288377d.zip
Generate unique derivation names so that we can easily install them from a Nix channel
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/default.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix2
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix4
4 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 71ed7f618b53..9a5736b37acd 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -27,12 +27,14 @@ rec {
   };
   
   simulate_kitchensink_iphone = import ./simulate-kitchensink {
+    inherit (pkgs_darwin_x86_64) stdenv;
     inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
     kitchensink = kitchensink_iphone;
     device = "iPhone";
   };
   
   simulate_kitchensink_ipad = import ./simulate-kitchensink {
+    inherit (pkgs_darwin_x86_64) stdenv;
     inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
     kitchensink = kitchensink_iphone;
     device = "iPad";
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
index 5e518df57cfc..5187b0e02387 100644
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@@ -1,7 +1,7 @@
 {androidenv, kitchensink}:
 
 androidenv.emulateApp {
-  name = "kitchensink";
+  name = "emulate-${kitchensink.name}";
   app = kitchensink;
   platformVersion = "16";
   useGoogleAPIs = true;
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index f557760dca0d..49ce9a2c9b5d 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,7 +1,7 @@
 {titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ]}:
 
 titaniumenv.buildApp {
-  name = "KitchenSink";
+  name = "KitchenSink-${target}";
   appId = "com.appcelerator.kitchensink";
   src = fetchgit {
     url = https://github.com/appcelerator/KitchenSink.git;
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
index 70ec534f6ae2..380e67c800d0 100644
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -1,7 +1,7 @@
-{xcodeenv, kitchensink, device}:
+{stdenv, xcodeenv, kitchensink, device}:
 
 xcodeenv.simulateApp {
-  name = "kitchensink";
+  name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}";
   app = kitchensink;
   inherit device;
   baseDir = "build/iphone/build/Debug-iphonesimulator";