Merge staging-next into master

2019-06-15 10:46:55 +02:00
parent 96d79aff40 3cf9c7163f
commit 9bd6c5d817
52 changed files with 473 additions and 230 deletions
@@ -26,7 +26,7 @@ let
  # Determine the Android os identifier from Nix's system identifier
  os = if stdenv.system == "x86_64-linux" then "linux"
    else if stdenv.system == "x86_64-darwin" then "macosx"
-    else throw "No tarballs found for system architecture: ${stdenv.system}";
+    else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";

  # Generated Nix packages
  packages = import ./generated/packages.nix {