2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index c05bf88ffbff..8fe9846c15af 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -113,6 +113,11 @@ stdenv.mkDerivation {
            "cp -av build/iphone/build/* $out"
         else if target == "iphone" then ""
         else throw "Target: ${target} is not supported!"}
+    
+    ${if target == "android" then ''
+        mkdir -p $out/nix-support
+        echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
+    '' else ""}
   '';
   
   failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 1526d4c43590..a2146d9b97ce 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,37 +1,33 @@
+{ nixpkgs ? <nixpkgs> }:
+
 let
-  pkgs = import <nixpkgs> {};
-  pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
+  pkgs = import nixpkgs {};
+  pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
 in
 rec {
-  titaniumenv = import ./.. {
-    inherit pkgs pkgs_i686;
-  };
-  
   kitchensink_android = import ./kitchensink {
-    inherit titaniumenv;
-    inherit (pkgs) fetchgit;
+    inherit (pkgs) fetchgit titaniumenv;
     target = "android";
   };
   
   kitchensink_iphone = import ./kitchensink {
-    inherit titaniumenv;
-    inherit (pkgs) fetchgit;
+    inherit (pkgs_darwin_x86_64) fetchgit titaniumenv;
     target = "iphone";
   };
   
   emulate_kitchensink = import ./emulate-kitchensink {
-    inherit (titaniumenv) androidenv;
+    inherit (pkgs.titaniumenv) androidenv;
     kitchensink = kitchensink_android;
   };
   
   simulate_kitchensink_iphone = import ./simulate-kitchensink {
-    inherit (titaniumenv) xcodeenv;
+    inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
     kitchensink = kitchensink_iphone;
     device = "iPhone";
   };
   
   simulate_kitchensink_ipad = import ./simulate-kitchensink {
-    inherit (titaniumenv) xcodeenv;
+    inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
     kitchensink = kitchensink_iphone;
     device = "iPad";
   };