mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues 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
This commit is contained in:
Axel Karjalainen 2024-09-11 01:06:52 +03:00 committed by GitHub
parent e9bb8e91eb
commit a99c334965
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -688,7 +688,7 @@ stdenvNoCC.mkDerivation {
'' ''
+ optionalString targetPlatform.isAndroid '' + 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 # There are a few tools (to name one libstdcxx5) which do not work

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

@ -19448,7 +19448,7 @@ with pkgs;
# TODO(@Ericson2314): Build bionic libc from source # TODO(@Ericson2314): Build bionic libc from source
bionic = if stdenv.hostPlatform.useAndroidPrebuilt 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 { }; else callPackage ../os-specific/linux/bionic-prebuilt { };
boolstuff = callPackage ../development/libraries/boolstuff { }; boolstuff = callPackage ../development/libraries/boolstuff { };