More Android improvements

default.nix

@@ -183,7 +183,7 @@ let all-cabal-hashes = fetchFromGitHub {
       shims = if builtins.pathExists ./shims/github.json then fetchFromGitHub (builtins.fromJSON (builtins.readFile ./shims/github.json)) else filterGit ./shims;
       ghcjs = if builtins.pathExists ./ghcjs/github.json then fetchFromGitHub (builtins.fromJSON (builtins.readFile ./ghcjs/github.json)) else filterGit ./ghcjs;
     };
-    inherit (nixpkgs.stdenv.lib) optionals;
+    inherit (nixpkgs.stdenv.lib) optional optionals;
 in with lib;
 let overrideCabal = pkg: f: if pkg == null then null else lib.overrideCabal pkg f;
     exposeAeson = aeson: overrideCabal aeson (drv: {
@@ -813,6 +813,7 @@ in let this = rec {
   androidDevTools = [
     ghc.haven
     nixpkgs.maven
+    nixpkgs.androidsdk
   ];
 
   # Tools that are useful for development under both ghc and ghcjs
@@ -873,7 +874,10 @@ in let this = rec {
         ghcWithStuff = if platform == "ghc" || platform == "ghcjs" then haskellPackages.ghcWithHoogle else haskellPackages.ghcWithPackages;
     in ghcWithStuff (p: import ./packages.nix { haskellPackages = p; inherit platform; });
 
-  tryReflexPackages = generalDevTools ghc ++ builtins.map reflexEnv platforms;
+  tryReflexPackages = generalDevTools ghc
+    ++ builtins.map reflexEnv platforms
+    ++ optional (system == "x86_64-darwin") iosReflexTodomvc
+    ++ optional (system != "x86_64-darwin") androidReflexTodomvc;
 
   demoVM = (import "${nixpkgs.path}/nixos" {
     configuration = {

packages.nix

@@ -8,16 +8,17 @@ with haskellPackages;
   ##############################################################################
   reflex
   reflex-dom
-  reflex-todomvc
 
 ] ++ (if platform == "ghcjs" then [
   ##############################################################################
   # Add ghcjs-only packages here                                               #
   ##############################################################################
+  reflex-todomvc
 
 ] else []) ++ (if platform == "ghc" then [
   ##############################################################################
   # Add ghc-only packages here                                                 #
   ##############################################################################
+  reflex-todomvc
 
 ] else []) ++ builtins.concatLists (map (x: (x.override { mkDerivation = drv: { out = (drv.buildDepends or []) ++ (drv.libraryHaskellDepends or []) ++ (drv.executableHaskellDepends or []); }; }).out) [ reflex reflex-dom reflex-todomvc ])