We don't need a reference here to titaniumenv, so remove it

This commit is contained in:
Sander van der Burg 2013-03-05 15:57:54 +01:00
parent ed6529ea44
commit 69a13e4e92

View File

@ -2,38 +2,31 @@
let let
pkgs = import nixpkgs {}; pkgs = import nixpkgs {};
pkgs_i686 = import nixpkgs { system = "i686-linux"; };
in in
rec { rec {
titaniumenv = import ./.. {
inherit pkgs pkgs_i686;
};
kitchensink_android = import ./kitchensink { kitchensink_android = import ./kitchensink {
inherit titaniumenv; inherit (pkgs) fetchgit titaniumenv;
inherit (pkgs) fetchgit;
target = "android"; target = "android";
}; };
kitchensink_iphone = import ./kitchensink { kitchensink_iphone = import ./kitchensink {
inherit titaniumenv; inherit (pkgs) fetchgit titaniumenv;
inherit (pkgs) fetchgit;
target = "iphone"; target = "iphone";
}; };
emulate_kitchensink = import ./emulate-kitchensink { emulate_kitchensink = import ./emulate-kitchensink {
inherit (titaniumenv) androidenv; inherit (pkgs.titaniumenv) androidenv;
kitchensink = kitchensink_android; kitchensink = kitchensink_android;
}; };
simulate_kitchensink_iphone = import ./simulate-kitchensink { simulate_kitchensink_iphone = import ./simulate-kitchensink {
inherit (titaniumenv) xcodeenv; inherit (pkgs.titaniumenv) xcodeenv;
kitchensink = kitchensink_iphone; kitchensink = kitchensink_iphone;
device = "iPhone"; device = "iPhone";
}; };
simulate_kitchensink_ipad = import ./simulate-kitchensink { simulate_kitchensink_ipad = import ./simulate-kitchensink {
inherit (titaniumenv) xcodeenv; inherit (pkgs.titaniumenv) xcodeenv;
kitchensink = kitchensink_iphone; kitchensink = kitchensink_iphone;
device = "iPad"; device = "iPad";
}; };