Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra
2013-03-07 19:33:52 +01:00
121 changed files with 1677 additions and 727 deletions
@@ -37,5 +37,8 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
mv bin/*-${if release then "release" else "debug"}.apk $out
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
'';
}