Merge branch 'master' into staging

2018-12-25 17:03:57 +01:00
parent 4c5a5dc627 996d14a004
commit c45e9d0fac
123 changed files with 6724 additions and 10105 deletions
@@ -53,7 +53,7 @@ in lib.init bootStages ++ [
      cc = if crossSystem.useiOSPrebuilt or false
             then buildPackages.darwin.iosSdkPkgs.clang
           else if crossSystem.useAndroidPrebuilt or false
-             then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
+             then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc
           else buildPackages.gcc;

      extraNativeBuildInputs = old.extraNativeBuildInputs