diff options
author | Sander van der Burg <sander@conference-compass.com> | 2014-01-13 14:15:05 +0100 |
---|---|---|
committer | Sander van der Burg <sander@conference-compass.com> | 2014-01-13 14:15:05 +0100 |
commit | dca1c4afb00a8e39818fa452908932e3a22fcf73 (patch) | |
tree | d14a4ecafc1a7f49862f2cf38865c57825c0f9c8 /pkgs | |
parent | 10a6618d606f0314aeb012df26aa10dec24dfe72 (diff) | |
download | nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar.gz nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar.bz2 nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar.lz nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar.xz nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.tar.zst nixlib-dca1c4afb00a8e39818fa452908932e3a22fcf73.zip |
Removed old SDK version support and updated kitchensink version
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/mobile/titaniumenv/examples/default.nix | 74 | ||||
-rw-r--r-- | pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix | 4 |
2 files changed, 43 insertions, 35 deletions
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 9a5736b37acd..73cca85c9f58 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,42 +1,50 @@ { nixpkgs ? <nixpkgs> -, system ? builtins.currentSystem -, version ? "3.1" +, systems ? [ "x86_64-linux" "x86_64-darwin" ] }: let - pkgs = import nixpkgs { inherit system; }; - pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; }; - versionString = pkgs.stdenv.lib.replaceChars [ "." ] [ "_" ] version; + pkgs = import nixpkgs {}; in rec { - kitchensink_android = import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs; - target = "android"; - }; + kitchensink_android = pkgs.lib.genAttrs systems (system: + let + pkgs = import nixpkgs { inherit system; }; + in + import ./kitchensink { + inherit (pkgs) fetchgit titaniumenv; + target = "android"; + }); - kitchensink_iphone = import ./kitchensink { - inherit (pkgs_darwin_x86_64) fetchgit; - titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs_darwin_x86_64; - target = "iphone"; - }; + emulate_kitchensink = pkgs.lib.genAttrs systems (system: + let + pkgs = import nixpkgs { inherit system; }; + in + import ./emulate-kitchensink { + inherit (pkgs.titaniumenv) androidenv; + kitchensink = kitchensink_android; + }); - emulate_kitchensink = import ./emulate-kitchensink { - inherit (pkgs.titaniumenv) androidenv; - kitchensink = kitchensink_android; - }; - - simulate_kitchensink_iphone = import ./simulate-kitchensink { - inherit (pkgs_darwin_x86_64) stdenv; - inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv; - kitchensink = kitchensink_iphone; - device = "iPhone"; - }; +} // (if builtins.elem "x86_64-darwin" systems then + let + pkgs = import nixpkgs { system = "x86_64-darwin"; }; + in + rec { + kitchensink_iphone = import ./kitchensink { + inherit (pkgs) fetchgit titaniumenv; + target = "iphone"; + }; + + simulate_kitchensink_iphone = import ./simulate-kitchensink { + inherit (pkgs) stdenv; + inherit (pkgs.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"; - }; -} + simulate_kitchensink_ipad = import ./simulate-kitchensink { + inherit (pkgs) stdenv; + inherit (pkgs.titaniumenv) xcodeenv; + kitchensink = kitchensink_iphone; + device = "iPad"; + }; +} else {}) diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index b195bfcae7a2..4ddfce968a89 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -6,8 +6,8 @@ titaniumenv.buildApp { appId = "com.appcelerator.kitchensink"; src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; - rev = "b68757ef6639e3da564e21038dc9c1aee1f80907"; - sha256 = "17yabdkl0p6pf2a2lcgw1kid2smwc8rnpx0i9fa4avj6930cbh5i"; + rev = "d9f39950c0137a1dd67c925ef9e8046a9f0644ff"; + sha256 = "0aj42ac262hw9n9blzhfibg61kkbp3wky69rp2yhd11vwjlcq1qc"; }; inherit target androidPlatformVersions; |