ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

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

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

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