diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2013-03-05 15:39:51 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2013-03-05 15:39:51 +0100 |
| commit | ed6529ea44402f7088e2f80554c2c7a34a29f776 (patch) | |
| tree | 8253fe1b53afdec9762fb2661a3e229a4172fbc6 /pkgs/development | |
| parent | 31b19d39f3713362003574ca35ba8240a0f4f003 (diff) | |
| download | nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar.gz nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar.bz2 nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar.lz nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar.xz nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.tar.zst nixlib-ed6529ea44402f7088e2f80554c2c7a34a29f776.zip | |
- Store resulting APK in hydra build artifacts
- Make nixpkgs configurable in the test examples
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/examples/default.nix | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index c05bf88ffbff..8fe9846c15af 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -113,6 +113,11 @@ stdenv.mkDerivation { "cp -av build/iphone/build/* $out" else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} + + ${if target == "android" then '' + mkdir -p $out/nix-support + echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products + '' else ""} ''; failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 1526d4c43590..952febebc323 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,6 +1,8 @@ +{ nixpkgs ? <nixpkgs> }: + let - pkgs = import <nixpkgs> {}; - pkgs_i686 = import <nixpkgs> { system = "i686-linux"; }; + pkgs = import nixpkgs {}; + pkgs_i686 = import nixpkgs { system = "i686-linux"; }; in rec { titaniumenv = import ./.. { |