From be7ee31fc3037a557fe55390db063e73dfb6e009 Mon Sep 17 00:00:00 2001 From: Axel Karjalainen Date: Wed, 11 Sep 2024 01:06:52 +0300 Subject: [PATCH] treewide: Fix remaining Android sdkVer and ndkVer references (#341106) Fix remaining sdkVer and ndkVer references 1144d46 renamed sdkVer and ndkVer, but forgot one reference and incorrectly replaced another (cherry picked from commit a99c3349650f6a79ee58fd520a9844631f4b08b9) --- pkgs/build-support/cc-wrapper/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4adc1dcb1f8d..060448fd4446 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -693,7 +693,7 @@ stdenvNoCC.mkDerivation { '' + optionalString targetPlatform.isAndroid '' - echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags '' # There are a few tools (to name one libstdcxx5) which do not work diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21ee5326b1e0..64cb8112da81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20103,7 +20103,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt - then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries + then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; boolstuff = callPackage ../development/libraries/boolstuff { };