diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 09:33:25 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 09:33:25 -0400 |
| commit | cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a (patch) | |
| tree | ae01e7338cb262f878ea46c406ee50852df73e7c /pkgs/stdenv | |
| parent | fc048073e6b25a81282a972778fe2c430b604908 (diff) | |
| download | nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar.gz nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar.bz2 nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar.lz nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar.xz nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.tar.zst nixpkgs-cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a.zip | |
android: Use NDK 17 for aarch32
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 41b5fd99504..973be983186 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,9 +41,7 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) - then buildPackages.androidenv.androidndkPkgs_10e.gcc - else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) + else if crossSystem.useAndroidPrebuilt then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; |