cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Make xcode version configurable + fix android emulator tests

Browse source
This commit is contained in:
Sander van der Burg 2014-01-13 14:34:46 +01:00
parent 25bd160ca8
commit 0583cb37e6
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/mobile/titaniumenv/examples/default.nix
View file

@ -1,5 +1,6 @@
{ nixpkgs ? <nixpkgs>
, systems ? [ "x86_64-linux" "x86_64-darwin" ]
, xcodeVersion ? "5.0"
}:
let
@ -21,7 +22,7 @@ rec {
in
import ./emulate-kitchensink {
inherit (pkgs.titaniumenv) androidenv;
kitchensink = kitchensink_android;
kitchensink = builtins.getAttr system kitchensink_android;
});
} // (if builtins.elem "x86_64-darwin" systems then
@ -30,20 +31,21 @@ rec {
in
rec {
kitchensink_iphone = import ./kitchensink {
inherit (pkgs) fetchgit titaniumenv;
inherit (pkgs) fetchgit;
titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion; };
target = "iphone";
};
simulate_kitchensink_iphone = import ./simulate-kitchensink {
inherit (pkgs) stdenv;
inherit (pkgs.titaniumenv) xcodeenv;
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
kitchensink = kitchensink_iphone;
device = "iPhone";
};
simulate_kitchensink_ipad = import ./simulate-kitchensink {
inherit (pkgs) stdenv;
inherit (pkgs.titaniumenv) xcodeenv;
xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
kitchensink = kitchensink_iphone;
device = "iPad";
};

2
pkgs/top-level/all-packages.nix
View file

@ -483,7 +483,7 @@ let
xcodeenv = callPackage ../development/mobile/xcodeenv { };
titaniumenv = import ../development/mobile/titaniumenv {
titaniumenv = callPackage ../development/mobile/titaniumenv {
inherit pkgs;
pkgs_i686 = pkgsi686Linux;
};