diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 10:21:43 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 11:06:17 -0400 |
| commit | c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea (patch) | |
| tree | 6bbf251dabef7bd95397f7dc34a7843c3c3b1852 /pkgs/stdenv/cross | |
| parent | cf09ffe9aaf2a5bddf624a60c4542069c3ed8e7a (diff) | |
| download | nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.gz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.bz2 nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.lz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.xz nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.tar.zst nixpkgs-c8fd285c8d9f307c02baa0da0c3fab0182bdc6ea.zip | |
android: add ndkVer to resolve ndk ambiguity
It wasn’t exactly clear which NDK you were using previously. This adds an attribute to system that handles what version of the NDK we should use when building things. /cc @Ericson2314
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 973be983186..ab42dd319a6 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -42,7 +42,7 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt - then buildPackages.androidenv.androidndkPkgs.gcc + then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; }; }) |