Removed old SDK version support and updated kitchensink version
This commit is contained in:
parent
10a6618d60
commit
dca1c4afb0
|
@ -1,42 +1,50 @@
|
||||||
{ nixpkgs ? <nixpkgs>
|
{ nixpkgs ? <nixpkgs>
|
||||||
, system ? builtins.currentSystem
|
, systems ? [ "x86_64-linux" "x86_64-darwin" ]
|
||||||
, version ? "3.1"
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs {};
|
||||||
pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
|
|
||||||
versionString = pkgs.stdenv.lib.replaceChars [ "." ] [ "_" ] version;
|
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
kitchensink_android = import ./kitchensink {
|
kitchensink_android = pkgs.lib.genAttrs systems (system:
|
||||||
inherit (pkgs) fetchgit;
|
let
|
||||||
titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs;
|
pkgs = import nixpkgs { inherit system; };
|
||||||
target = "android";
|
in
|
||||||
};
|
import ./kitchensink {
|
||||||
|
inherit (pkgs) fetchgit titaniumenv;
|
||||||
|
target = "android";
|
||||||
|
});
|
||||||
|
|
||||||
kitchensink_iphone = import ./kitchensink {
|
emulate_kitchensink = pkgs.lib.genAttrs systems (system:
|
||||||
inherit (pkgs_darwin_x86_64) fetchgit;
|
let
|
||||||
titaniumenv = builtins.getAttr "titaniumenv_${versionString}" pkgs_darwin_x86_64;
|
pkgs = import nixpkgs { inherit system; };
|
||||||
target = "iphone";
|
in
|
||||||
};
|
import ./emulate-kitchensink {
|
||||||
|
inherit (pkgs.titaniumenv) androidenv;
|
||||||
|
kitchensink = kitchensink_android;
|
||||||
|
});
|
||||||
|
|
||||||
emulate_kitchensink = import ./emulate-kitchensink {
|
} // (if builtins.elem "x86_64-darwin" systems then
|
||||||
inherit (pkgs.titaniumenv) androidenv;
|
let
|
||||||
kitchensink = kitchensink_android;
|
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_iphone = import ./simulate-kitchensink {
|
simulate_kitchensink_ipad = import ./simulate-kitchensink {
|
||||||
inherit (pkgs_darwin_x86_64) stdenv;
|
inherit (pkgs) stdenv;
|
||||||
inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
|
inherit (pkgs.titaniumenv) xcodeenv;
|
||||||
kitchensink = kitchensink_iphone;
|
kitchensink = kitchensink_iphone;
|
||||||
device = "iPhone";
|
device = "iPad";
|
||||||
};
|
};
|
||||||
|
} else {})
|
||||||
simulate_kitchensink_ipad = import ./simulate-kitchensink {
|
|
||||||
inherit (pkgs_darwin_x86_64) stdenv;
|
|
||||||
inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
|
|
||||||
kitchensink = kitchensink_iphone;
|
|
||||||
device = "iPad";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
|
@ -6,8 +6,8 @@ titaniumenv.buildApp {
|
||||||
appId = "com.appcelerator.kitchensink";
|
appId = "com.appcelerator.kitchensink";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = https://github.com/appcelerator/KitchenSink.git;
|
url = https://github.com/appcelerator/KitchenSink.git;
|
||||||
rev = "b68757ef6639e3da564e21038dc9c1aee1f80907";
|
rev = "d9f39950c0137a1dd67c925ef9e8046a9f0644ff";
|
||||||
sha256 = "17yabdkl0p6pf2a2lcgw1kid2smwc8rnpx0i9fa4avj6930cbh5i";
|
sha256 = "0aj42ac262hw9n9blzhfibg61kkbp3wky69rp2yhd11vwjlcq1qc";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit target androidPlatformVersions;
|
inherit target androidPlatformVersions;
|
||||||
|
|
Loading…
Reference in New Issue