diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
| commit | c45e9d0fac5158d90f8c951a2899755181e97dc7 (patch) | |
| tree | 87cdea30c650739a0ef20c6342deb39e77f1e07b /pkgs/stdenv | |
| parent | 4c5a5dc6270d0552f71937d5d73cc36a7f3a2326 (diff) | |
| parent | 996d14a00489c5a20258229d7837649e91e9b2fc (diff) | |
| download | nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.gz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.bz2 nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.lz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.xz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.zst nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/stdenv')
| -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 7d98e5cf4886..aafc0855dbe3 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -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 |