movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 04:05:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib/systems: remove android cruft

Browse source 
These used legacy names for Android SDK and NDK versions, so now we can
do away with them.
This commit is contained in:
Morgan Jones 2025-05-12 23:43:16 -07:00
parent 688122cd5d
commit 9d3c069cbd
No known key found for this signature in database
GPG key ID: 5C3EB94D198F1491
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/systems/default.nix
View file

@ -352,21 +352,9 @@ let
else else
null; null;
# Remove before 25.05 # Handle Android SDK and NDK versions.
androidSdkVersion = androidSdkVersion = args.androidSdkVersion or null;
if (args ? sdkVer && !args ? androidSdkVersion) then androidNdkVersion = args.androidNdkVersion or null;
throw "For android `sdkVer` has been renamed to `androidSdkVersion`"
else if (args ? androidSdkVersion) then
args.androidSdkVersion
else
null;
androidNdkVersion =
if (args ? ndkVer && !args ? androidNdkVersion) then
throw "For android `ndkVer` has been renamed to `androidNdkVersion`"
else if (args ? androidSdkVersion) then
args.androidNdkVersion
else
null;
} }
// ( // (
let let