diff options
| author | Bastian Köcher <git@kchr.de> | 2018-05-17 17:22:27 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-05-17 17:22:27 +0200 |
| commit | 832a8ca087b748db7be7969581e0e10ae1eb486c (patch) | |
| tree | 017eecd2181fcadb2dcb4af1dea616ad17a6a357 /pkgs/stdenv/cross/default.nix | |
| parent | c056694d74fe99c6a0657528fac73645680e0df8 (diff) | |
| download | nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar.gz nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar.bz2 nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar.lz nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar.xz nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.tar.zst nixlib-832a8ca087b748db7be7969581e0e10ae1eb486c.zip | |
androidndk: Fix usage as crossSystem
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 973be9831861..41b5fd99504d 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,7 +41,9 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if crossSystem.useAndroidPrebuilt + else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) + then buildPackages.androidenv.androidndkPkgs_10e.gcc + else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; |