mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
- Store resulting APK in hydra build artifacts
- Make nixpkgs configurable in the test examples
This commit is contained in:
parent
31b19d39f3
commit
ed6529ea44
2 changed files with 9 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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 ./.. {
|
||||
|
|
Loading…
Reference in a new issue