nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-24 01:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Fix remaining Android sdkVer and ndkVer references (#341106)

Browse Source 
Fix remaining sdkVer and ndkVer references

1144d46 renamed sdkVer and ndkVer, but forgot one reference and
incorrectly replaced another

(cherry picked from commit a99c334965)
This commit is contained in:
Axel Karjalainen
2024-09-11 01:06:52 +03:00
committed by github-actions[bot]
parent e775ab787b
commit be7ee31fc3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -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

2
pkgs/top-level/all-packages.nix
View File

@@ -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 { };